diff --git a/src/com/fsck/k9/local/LocalFolder.java b/src/com/fsck/k9/local/LocalFolder.java
index 33e177f9a..a35428adb 100644
--- a/src/com/fsck/k9/local/LocalFolder.java
+++ b/src/com/fsck/k9/local/LocalFolder.java
@@ -116,8 +116,6 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
         return getAccount().syncRemoteDeletions();
     }
 
-
-
     @Override
     public void open(final int mode) throws MessagingException {
 
diff --git a/src/com/fsck/k9/local/LocalMessage.java b/src/com/fsck/k9/local/LocalMessage.java
index ac3aa5918..cc9cef2de 100644
--- a/src/com/fsck/k9/local/LocalMessage.java
+++ b/src/com/fsck/k9/local/LocalMessage.java
@@ -601,14 +601,18 @@ public class LocalMessage extends MimeMessage {
         if (o == null || getClass() != o.getClass()) return false;
         if (!super.equals(o)) return false;
 
-        LocalMessage that = (LocalMessage) o;
-        return !(getUid() != null ? !getUid().equals(that.getUid()) : that.getUid() != null);
+        final LocalMessage that = (LocalMessage) o;
+        return !(getAccountUuid() != null ? !getAccountUuid().equals(that.getAccountUuid()) : that.getAccountUuid() != null);
     }
 
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (getUid() != null ? getUid().hashCode() : 0);
+        result = 31 * result + (getAccountUuid() != null ? getAccountUuid().hashCode() : 0);
         return result;
     }
+
+    private String getAccountUuid() {
+        return getAccount().getUuid();
+    }
 }
\ No newline at end of file
diff --git a/src/com/fsck/k9/mail/Message.java b/src/com/fsck/k9/mail/Message.java
index b0bfe12af..24a29af5f 100644
--- a/src/com/fsck/k9/mail/Message.java
+++ b/src/com/fsck/k9/mail/Message.java
@@ -47,8 +47,8 @@ public abstract class Message implements Part, CompositeBody {
             return false;
         }
         Message other = (Message)o;
-        return (mUid.equals(other.getUid())
-                && mFolder.getName().equals(other.getFolder().getName()));
+        return (getUid().equals(other.getUid())
+                && getFolder().getName().equals(other.getFolder().getName()));
     }
 
     @Override