diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
index bf4307346..d15caf7b0 100644
--- a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
@@ -21,7 +21,7 @@ import com.fsck.k9.mail.internet.Viewable;
 import com.fsck.k9.mailstore.MessageViewInfo.MessageViewContainer;
 import com.fsck.k9.provider.AttachmentProvider;
 import com.fsck.k9.provider.K9FileProvider;
-import com.fsck.k9.ui.crypto.MessageCryptoHelper.MessageCryptoAnnotations;
+import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
 import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.OpenPgpSignatureResult;
 
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java
new file mode 100644
index 000000000..81a90e14a
--- /dev/null
+++ b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java
@@ -0,0 +1,28 @@
+package com.fsck.k9.ui.crypto;
+
+
+import java.util.HashMap;
+
+import com.fsck.k9.mail.Part;
+import com.fsck.k9.mailstore.OpenPgpResultAnnotation;
+
+
+public class MessageCryptoAnnotations {
+    private HashMap<Part, OpenPgpResultAnnotation> annotations = new HashMap<Part, OpenPgpResultAnnotation>();
+
+    MessageCryptoAnnotations() {
+        // Package-private constructor
+    }
+
+    void put(Part part, OpenPgpResultAnnotation annotation) {
+        annotations.put(part, annotation);
+    }
+
+    public OpenPgpResultAnnotation get(Part part) {
+        return annotations.get(part);
+    }
+
+    public boolean has(Part part) {
+        return annotations.containsKey(part);
+    }
+}
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java
index f72effb71..b787f9211 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java
@@ -1,9 +1,6 @@
 package com.fsck.k9.ui.crypto;
 
 
-import com.fsck.k9.ui.crypto.MessageCryptoHelper.MessageCryptoAnnotations;
-
-
 public interface MessageCryptoCallback {
     void onCryptoOperationsFinished(MessageCryptoAnnotations annotations);
 }
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
index 2aa15a488..f28e50f93 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
@@ -7,7 +7,6 @@ import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.util.ArrayDeque;
 import java.util.Deque;
-import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
@@ -420,23 +419,4 @@ public class MessageCryptoHelper {
     private void returnResultToFragment() {
         callback.onCryptoOperationsFinished(messageAnnotations);
     }
-
-    public static class MessageCryptoAnnotations {
-
-        private HashMap<Part,OpenPgpResultAnnotation> annotations = new HashMap<Part,OpenPgpResultAnnotation>();
-
-        private void put(Part part, OpenPgpResultAnnotation annotation) {
-            annotations.put(part, annotation);
-        }
-
-        public OpenPgpResultAnnotation get(Part part) {
-            return annotations.get(part);
-        }
-
-        public boolean has(Part part) {
-            return annotations.containsKey(part);
-        }
-
-    }
-
 }
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/message/DecodeMessageLoader.java b/k9mail/src/main/java/com/fsck/k9/ui/message/DecodeMessageLoader.java
index bbf0d9f93..9d7fe0d1a 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/message/DecodeMessageLoader.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/message/DecodeMessageLoader.java
@@ -9,7 +9,7 @@ import com.fsck.k9.K9;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mailstore.LocalMessageExtractor;
 import com.fsck.k9.mailstore.MessageViewInfo;
-import com.fsck.k9.ui.crypto.MessageCryptoHelper.MessageCryptoAnnotations;
+import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
 
 
 public class DecodeMessageLoader extends AsyncTaskLoader<MessageViewInfo> {
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
index 28186c4ee..c030a0add 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
@@ -50,7 +50,7 @@ import com.fsck.k9.ui.crypto.MessageCryptoCallback;
 import com.fsck.k9.ui.crypto.MessageCryptoHelper;
 import com.fsck.k9.ui.message.DecodeMessageLoader;
 import com.fsck.k9.ui.message.LocalMessageLoader;
-import com.fsck.k9.ui.crypto.MessageCryptoHelper.MessageCryptoAnnotations;
+import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
 import com.fsck.k9.view.MessageHeader;
 
 public class MessageViewFragment extends Fragment implements ConfirmationDialogFragmentListener,