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 72a0567c3..bf4307346 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.messageview.MessageCryptoHelper.MessageCryptoAnnotations;
+import com.fsck.k9.ui.crypto.MessageCryptoHelper.MessageCryptoAnnotations;
 import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.OpenPgpSignatureResult;
 
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 f5ff35b1e..f72effb71 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,7 +1,7 @@
 package com.fsck.k9.ui.crypto;
 
 
-import com.fsck.k9.ui.messageview.MessageCryptoHelper.MessageCryptoAnnotations;
+import com.fsck.k9.ui.crypto.MessageCryptoHelper.MessageCryptoAnnotations;
 
 
 public interface MessageCryptoCallback {
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoHelper.java b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
similarity index 99%
rename from k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoHelper.java
rename to k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
index 1b1314ee6..2aa15a488 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoHelper.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.ui.messageview;
+package com.fsck.k9.ui.crypto;
 
 
 import java.io.ByteArrayOutputStream;
@@ -38,7 +38,6 @@ import com.fsck.k9.mail.internet.TextBody;
 import com.fsck.k9.mailstore.DecryptStreamParser;
 import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.mailstore.OpenPgpResultAnnotation;
-import com.fsck.k9.ui.crypto.MessageCryptoCallback;
 import org.openintents.openpgp.IOpenPgpService;
 import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.OpenPgpSignatureResult;
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 d2644acaf..bbf0d9f93 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.messageview.MessageCryptoHelper.MessageCryptoAnnotations;
+import com.fsck.k9.ui.crypto.MessageCryptoHelper.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 d32a59bd6..28186c4ee 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
@@ -47,9 +47,10 @@ import com.fsck.k9.mailstore.AttachmentViewInfo;
 import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.mailstore.MessageViewInfo;
 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.messageview.MessageCryptoHelper.MessageCryptoAnnotations;
+import com.fsck.k9.ui.crypto.MessageCryptoHelper.MessageCryptoAnnotations;
 import com.fsck.k9.view.MessageHeader;
 
 public class MessageViewFragment extends Fragment implements ConfirmationDialogFragmentListener,