diff --git a/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg b/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg
index 1277ff58d08..2bbe6648467 100644
--- a/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg
+++ b/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg
@@ -6,10 +6,10 @@
             testchannel   betatest releasetest
             channel   beta release
             <partial>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.9-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.8-3.1.9.partial.mar
-                url   http://download.mozilla.org/?product=thunderbird-3.1.9-partial-3.1.8&os=%bouncer-platform%&lang=%locale%
-                path   thunderbird/nightly/3.1.9-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.8-3.1.9.partial.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.9-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.8-3.1.9.partial.mar
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.10-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.9-3.1.10.partial.mar
+                url   http://download.mozilla.org/?product=thunderbird-3.1.10-partial-3.1.9&os=%bouncer-platform%&lang=%locale%
+                path   thunderbird/nightly/3.1.10-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.9-3.1.10.partial.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.10-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.9-3.1.10.partial.mar
             </partial>
             details   http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%
             force   freebl3.chk
@@ -17,14 +17,14 @@
             force   nssdbm3.chk
             force   components/components.list
             force   Contents/MacOS/components/components.list
-            to   3.1.9
-            from   3.1.8
+            to   3.1.10
+            from   3.1.9
             beta-dir   beta
             <complete>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.9-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.9.complete.mar
-                url   http://download.mozilla.org/?product=thunderbird-3.1.9-complete&os=%bouncer-platform%&lang=%locale%
-                path   thunderbird/nightly/3.1.9-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.9.complete.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.9-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.9.complete.mar
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.10-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.10.complete.mar
+                url   http://download.mozilla.org/?product=thunderbird-3.1.10-complete&os=%bouncer-platform%&lang=%locale%
+                path   thunderbird/nightly/3.1.10-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.10.complete.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.10-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.10.complete.mar
             </complete>
         </current-update>
         past-update   3.1a1 3.1b1 betatest beta
@@ -39,6 +39,7 @@
         past-update   3.1.5 3.1.6 betatest releasetest beta release
         past-update   3.1.6 3.1.7 betatest releasetest beta release
         past-update   3.1.7 3.1.8 betatest releasetest beta release
+        past-update   3.1.8 3.1.9 betatest releasetest beta release
         <release>
             <3.1.6>
                 prettyVersion   3.1.6
@@ -108,6 +109,23 @@
                 extension-version   3.1
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1rc1-candidates/build3/update/%platform%/%locale%/thunderbird-3.1rc1.complete.mar
             </3.1rc1>
+            <3.1.10>
+                prettyVersion   3.1.10
+                <platforms>
+                    linux-i686   20110414112900
+                    win32   20110414114714
+                    mac   20110414112909
+                </platforms>
+                <exceptions>
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                version   3.1.10
+                locales   af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hu id is it ja ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE tr uk vi zh-CN zh-TW
+                schema   1
+                extension-version   3.1.10
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.10-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.10.complete.mar
+            </3.1.10>
             <3.1.7>
                 prettyVersion   3.1.7
                 <platforms>
@@ -125,23 +143,6 @@
                 extension-version   3.1.7
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.7-candidates/build3/update/%platform%/%locale%/thunderbird-3.1.7.complete.mar
             </3.1.7>
-            <3.1.1>
-                prettyVersion   3.1.1
-                <platforms>
-                    linux-i686   20100713154229
-                    win32   20100713161411
-                    mac   20100713184932
-                </platforms>
-                <exceptions>
-                    ja   linux-i686, win32
-                    ja-JP-mac   mac
-                </exceptions>
-                version   3.1.1
-                locales   af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE he hu id is it ja ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sl sq sv-SE tr uk vi zh-CN zh-TW
-                schema   1
-                extension-version   3.1.1
-                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.1-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.1.complete.mar
-            </3.1.1>
             <3.1b1>
                 <exceptions>
                     ja   linux-i686, win32
@@ -159,6 +160,23 @@
                 extension-version   3.1b1
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1b1-candidates/build1/update/%platform%/%locale%/lanikai-3.1b1.complete.mar
             </3.1b1>
+            <3.1.1>
+                prettyVersion   3.1.1
+                <platforms>
+                    linux-i686   20100713154229
+                    win32   20100713161411
+                    mac   20100713184932
+                </platforms>
+                <exceptions>
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                version   3.1.1
+                locales   af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE he hu id is it ja ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sl sq sv-SE tr uk vi zh-CN zh-TW
+                schema   1
+                extension-version   3.1.1
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.1-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.1.complete.mar
+            </3.1.1>
             <3.1.8>
                 prettyVersion   3.1.8
                 <platforms>
@@ -176,23 +194,6 @@
                 extension-version   3.1.8
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build3/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
             </3.1.8>
-            <3.1.5>
-                prettyVersion   3.1.5
-                <platforms>
-                    linux-i686   20101013165818
-                    win32   20101013171520
-                    mac   20101013195457
-                </platforms>
-                <exceptions>
-                    ja   linux-i686, win32
-                    ja-JP-mac   mac
-                </exceptions>
-                version   3.1.5
-                locales   af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hu id is it ja ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE tr uk vi zh-CN zh-TW
-                schema   1
-                extension-version   3.1.5
-                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.5-candidates/build3/update/%platform%/%locale%/thunderbird-3.1.5.complete.mar
-            </3.1.5>
             <3.1b2>
                 <exceptions>
                     ja   linux-i686, win32
@@ -210,6 +211,23 @@
                 extension-version   3.1b2
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1b2-candidates/build2/update/%platform%/%locale%/thunderbird-3.1b2.complete.mar
             </3.1b2>
+            <3.1.5>
+                prettyVersion   3.1.5
+                <platforms>
+                    linux-i686   20101013165818
+                    win32   20101013171520
+                    mac   20101013195457
+                </platforms>
+                <exceptions>
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                version   3.1.5
+                locales   af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hu id is it ja ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE tr uk vi zh-CN zh-TW
+                schema   1
+                extension-version   3.1.5
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.5-candidates/build3/update/%platform%/%locale%/thunderbird-3.1.5.complete.mar
+            </3.1.5>
             <3.1rc2>
                 prettyVersion   3.1 RC 2
                 <platforms>