diff --git a/k9mail/src/androidTest/java/com/fsck/k9/activity/MessageReferenceTest.java b/k9mail/src/androidTest/java/com/fsck/k9/activity/MessageReferenceTest.java
index 81c3e80c3..3ad1ba75b 100644
--- a/k9mail/src/androidTest/java/com/fsck/k9/activity/MessageReferenceTest.java
+++ b/k9mail/src/androidTest/java/com/fsck/k9/activity/MessageReferenceTest.java
@@ -36,27 +36,27 @@ public class MessageReferenceTest {
     public void parseIdentityStringWithoutFlag() throws MessagingException {
         MessageReference messageReference = new MessageReference("!:byBoYWkh:Zm9sZGVy:MTAxMDEwMTA=");
 
-        assertEquals("o hai!", messageReference.accountUuid);
-        assertEquals("folder", messageReference.folderName);
-        assertEquals("10101010", messageReference.uid);
-        assertNull(messageReference.flag);
+        assertEquals("o hai!", messageReference.getAccountUuid());
+        assertEquals("folder", messageReference.getFolderName());
+        assertEquals("10101010", messageReference.getUid());
+        assertNull(messageReference.getFlag());
     }
 
     @Test
     public void parseIdentityStringWithFlag() throws MessagingException {
         MessageReference messageReference = new MessageReference("!:byBoYWkh:Zm9sZGVy:MTAxMDEwMTA=:ANSWERED");
 
-        assertEquals("o hai!", messageReference.accountUuid);
-        assertEquals("folder", messageReference.folderName);
-        assertEquals("10101010", messageReference.uid);
-        assertEquals(Flag.ANSWERED, messageReference.flag);
+        assertEquals("o hai!", messageReference.getAccountUuid());
+        assertEquals("folder", messageReference.getFolderName());
+        assertEquals("10101010", messageReference.getUid());
+        assertEquals(Flag.ANSWERED, messageReference.getFlag());
     }
 
     @Test
     public void parseIdentityStringContainingBadVersionNumber() throws MessagingException {
         MessageReference messageReference = new MessageReference("@:byBoYWkh:Zm9sZGVy:MTAxMDEwMTA=:ANSWERED");
 
-        assertNull(messageReference.accountUuid);
+        assertNull(messageReference.getAccountUuid());
     }
 
     @Test(expected = MessagingException.class)
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
index 3dc3dcb88..d3e7091b0 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
@@ -2942,7 +2942,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
         @Override
         public void loadMessageForViewFinished(Account account, String folder, String uid, LocalMessage message) {
-            if ((mMessageReference == null) || !mMessageReference.uid.equals(uid)) {
+            if ((mMessageReference == null) || !mMessageReference.getUid().equals(uid)) {
                 return;
             }
 
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageReference.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageReference.java
index 12bd48549..2bbdbd912 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/MessageReference.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageReference.java
@@ -17,10 +17,10 @@ import com.fsck.k9.mail.filter.Base64;
 import java.util.StringTokenizer;
 
 public class MessageReference implements Parcelable {
-    protected final String accountUuid;
-    protected final String folderName;
-    protected final String uid;
-    protected final Flag flag;
+    private final String accountUuid;
+    private final String folderName;
+    private final String uid;
+    private final Flag flag;
 
 
     /**