diff --git a/embedding/android/GeckoSmsManager.java b/embedding/android/GeckoSmsManager.java
index 2120363c01d9..79d8e4b613dd 100644
--- a/embedding/android/GeckoSmsManager.java
+++ b/embedding/android/GeckoSmsManager.java
@@ -550,8 +550,6 @@ public class GeckoSmsManager
   }
 
   public int saveSentMessage(String aRecipient, String aBody, long aDate) {
-    class IdTooHighException extends Exception { }
-
     try {
       ContentValues values = new ContentValues();
       values.put("address", aRecipient);
@@ -593,11 +591,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class NotFoundException extends Exception { }
-        class UnmatchingIdException extends Exception { }
-        class TooManyResultsException extends Exception { }
-        class InvalidTypeException extends Exception { }
-
         Cursor cursor = null;
 
         try {
@@ -680,8 +673,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class TooManyResultsException extends Exception { }
-
         try {
           ContentResolver cr = GeckoApp.mAppContext.getContentResolver();
           Uri message = ContentUris.withAppendedId(kSmsContentUri, mMessageId);
@@ -733,9 +724,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class UnexpectedDeliveryStateException extends Exception { };
-        class InvalidTypeException extends Exception { }
-
         Cursor cursor = null;
         boolean closeCursor = true;
 
@@ -846,8 +834,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class UnexpectedDeliveryStateException extends Exception { };
-
         try {
           Cursor cursor = MessagesListManager.getInstance().get(mListId);
 
@@ -903,4 +889,28 @@ public class GeckoSmsManager
     SmsIOThread.getInstance().interrupt();
     MessagesListManager.getInstance().clear();
   }
+
+  class IdTooHighException extends Exception {
+    private static final long serialVersionUID = 395697882128640L;
+  }
+
+  class InvalidTypeException extends Exception {
+    private static final long serialVersionUID = 23359904803795434L;
+  }
+
+  class NotFoundException extends Exception {
+    private static final long serialVersionUID = 266226999371957426L;
+  }
+
+  class TooManyResultsException extends Exception {
+    private static final long serialVersionUID = 48899777673841920L;
+  }
+
+  class UnexpectedDeliveryStateException extends Exception {
+    private static final long serialVersionUID = 5044567998961920L;
+  }
+
+  class UnmatchingIdException extends Exception {
+    private static final long serialVersionUID = 1935649715512128L;
+  }
 }
diff --git a/mobile/android/base/GeckoSmsManager.java b/mobile/android/base/GeckoSmsManager.java
index c333fe5bd77c..be58f6e001f8 100644
--- a/mobile/android/base/GeckoSmsManager.java
+++ b/mobile/android/base/GeckoSmsManager.java
@@ -543,8 +543,6 @@ public class GeckoSmsManager
   }
 
   public int saveSentMessage(String aRecipient, String aBody, long aDate) {
-    class IdTooHighException extends Exception { }
-
     try {
       ContentValues values = new ContentValues();
       values.put("address", aRecipient);
@@ -586,11 +584,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class NotFoundException extends Exception { }
-        class UnmatchingIdException extends Exception { }
-        class TooManyResultsException extends Exception { }
-        class InvalidTypeException extends Exception { }
-
         Cursor cursor = null;
 
         try {
@@ -673,8 +666,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class TooManyResultsException extends Exception { }
-
         try {
           ContentResolver cr = GeckoApp.mAppContext.getContentResolver();
           Uri message = ContentUris.withAppendedId(kSmsContentUri, mMessageId);
@@ -726,9 +717,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class UnexpectedDeliveryStateException extends Exception { };
-        class InvalidTypeException extends Exception { }
-
         Cursor cursor = null;
         boolean closeCursor = true;
 
@@ -839,8 +827,6 @@ public class GeckoSmsManager
 
       @Override
       public void run() {
-        class UnexpectedDeliveryStateException extends Exception { };
-
         try {
           Cursor cursor = MessagesListManager.getInstance().get(mListId);
 
@@ -896,4 +882,28 @@ public class GeckoSmsManager
     SmsIOThread.getInstance().interrupt();
     MessagesListManager.getInstance().clear();
   }
+
+  class IdTooHighException extends Exception {
+    private static final long serialVersionUID = 29935575131092050L;
+  }
+
+  class InvalidTypeException extends Exception {
+    private static final long serialVersionUID = 47436856832535912L;
+  }
+
+  class NotFoundException extends Exception {
+    private static final long serialVersionUID = 1940676816633984L;
+  }
+
+  class TooManyResultsException extends Exception {
+    private static final long serialVersionUID = 51883196784325305L;
+  }
+
+  class UnexpectedDeliveryStateException extends Exception {
+    private static final long serialVersionUID = 494122763684005716L;
+  }
+
+  class UnmatchingIdException extends Exception {
+    private static final long serialVersionUID = 158467542575633280L;
+  }
 }