diff --git a/src/com/fsck/k9/mail/Message.java b/src/com/fsck/k9/mail/Message.java
index 2a7cd5efd..75a080289 100644
--- a/src/com/fsck/k9/mail/Message.java
+++ b/src/com/fsck/k9/mail/Message.java
@@ -52,9 +52,9 @@ public abstract class Message implements Part, Body {
             return false;
         }
         Message other = (Message)o;
-        return (mFolder.getName().equals(other.getFolder().getName())
-                && mFolder.getAccount().getUuid().equals(other.getFolder().getAccount().getUuid())
-                && mUid.equals(other.getUid()));
+        return (mUid.equals(other.getUid())
+                && mFolder.getName().equals(other.getFolder().getName())
+                && mFolder.getAccount().getUuid().equals(other.getFolder().getAccount().getUuid()));
     }
 
     @Override