diff --git a/src/com/fsck/k9/AccountStats.java b/src/com/fsck/k9/AccountStats.java
index 04815107f..8e36868c4 100644
--- a/src/com/fsck/k9/AccountStats.java
+++ b/src/com/fsck/k9/AccountStats.java
@@ -7,6 +7,7 @@ import java.io.Serializable;
 
 public class AccountStats implements Serializable
 {
+    private static final long serialVersionUID = -5706839923710842234L;
     public long size = -1;
     public int unreadMessageCount = 0;
     public int flaggedMessageCount = 0;
diff --git a/src/com/fsck/k9/Identity.java b/src/com/fsck/k9/Identity.java
index aa09625e3..3810bc210 100644
--- a/src/com/fsck/k9/Identity.java
+++ b/src/com/fsck/k9/Identity.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 public class Identity implements Serializable
 {
+    private static final long serialVersionUID = -1666669071480985760L;
     private String mDescription;
     private String mName;
     private String mEmail;
diff --git a/src/com/fsck/k9/SearchAccount.java b/src/com/fsck/k9/SearchAccount.java
index ccc368b05..433c63f76 100644
--- a/src/com/fsck/k9/SearchAccount.java
+++ b/src/com/fsck/k9/SearchAccount.java
@@ -12,6 +12,7 @@ import com.fsck.k9.mail.Flag;
 
 public class SearchAccount implements BaseAccount, SearchSpecification, Serializable
 {
+    private static final long serialVersionUID = -4388420303235543976L;
     private Flag[] mRequiredFlags = null;
     private Flag[] mForbiddenFlags = null;
     private String email = null;
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index db291e59b..e498d36f3 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -236,6 +236,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
     static class Attachment implements Serializable
     {
+        private static final long serialVersionUID = 3642382876618963734L;
         public String name;
         public String contentType;
         public long size;
diff --git a/src/com/fsck/k9/activity/MessageReference.java b/src/com/fsck/k9/activity/MessageReference.java
index 786633780..d97820ed9 100644
--- a/src/com/fsck/k9/activity/MessageReference.java
+++ b/src/com/fsck/k9/activity/MessageReference.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 public class MessageReference implements Serializable
 {
+    private static final long serialVersionUID = -1625198750239083389L;
     public String accountUuid;
     public String folderName;
     public String uid;
diff --git a/src/com/fsck/k9/crypto/PgpData.java b/src/com/fsck/k9/crypto/PgpData.java
index a97c4152b..a52622cc5 100644
--- a/src/com/fsck/k9/crypto/PgpData.java
+++ b/src/com/fsck/k9/crypto/PgpData.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 public class PgpData implements Serializable
 {
+    private static final long serialVersionUID = 6314045536470848410L;
     protected long mEncryptionKeyIds[] = null;
     protected long mSignatureKeyId = 0;
     protected String mSignatureUserId = null;
diff --git a/src/com/fsck/k9/mail/FetchProfile.java b/src/com/fsck/k9/mail/FetchProfile.java
index 3aceeb94f..f8231b6db 100644
--- a/src/com/fsck/k9/mail/FetchProfile.java
+++ b/src/com/fsck/k9/mail/FetchProfile.java
@@ -17,6 +17,8 @@ import java.util.ArrayList;
  */
 public class FetchProfile extends ArrayList<FetchProfile.Item>
 {
+    private static final long serialVersionUID = -5520076119120964166L;
+
     /**
      * Default items available for pre-fetching. It should be expected that any
      * item fetched by using these items could potentially include all of the
diff --git a/src/com/fsck/k9/mail/store/ImapResponseParser.java b/src/com/fsck/k9/mail/store/ImapResponseParser.java
index b05bbd703..86f39b026 100644
--- a/src/com/fsck/k9/mail/store/ImapResponseParser.java
+++ b/src/com/fsck/k9/mail/store/ImapResponseParser.java
@@ -423,6 +423,8 @@ public class ImapResponseParser
      */
     public class ImapList extends ArrayList<Object>
     {
+        private static final long serialVersionUID = -4067248341419617583L;
+
         public ImapList getList(int index)
         {
             return (ImapList)get(index);
@@ -580,6 +582,10 @@ public class ImapResponseParser
      */
     public class ImapResponse extends ImapList
     {
+        /**
+         *
+         */
+        private static final long serialVersionUID = 6886458551615975669L;
         private boolean mCompleted;
         private IImapResponseCallback mCallback;
 
diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java
index 28f52ff4b..271b5c74e 100644
--- a/src/com/fsck/k9/mail/store/ImapStore.java
+++ b/src/com/fsck/k9/mail/store/ImapStore.java
@@ -2942,6 +2942,7 @@ public class ImapStore extends Store
 
     static class ImapException extends MessagingException
     {
+        private static final long serialVersionUID = 3725007182205882394L;
         String mAlertText;
 
         public ImapException(String message, String alertText, Throwable throwable)
diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index c042b5da9..262ca8162 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -65,6 +65,8 @@ import com.fsck.k9.provider.AttachmentProvider;
 public class LocalStore extends Store implements Serializable
 {
 
+    private static final long serialVersionUID = -5142141896809423072L;
+
     private static final Message[] EMPTY_MESSAGE_ARRAY = new Message[0];
 
     /**
@@ -1286,6 +1288,7 @@ public class LocalStore extends Store implements Serializable
 
     public class LocalFolder extends Folder implements Serializable
     {
+        private static final long serialVersionUID = -1973296520918624767L;
         private String mName = null;
         private long mFolderId = -1;
         private int mUnreadMessageCount = -1;