diff --git a/k9mail/src/main/java/com/fsck/k9/view/AttachmentView.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java
similarity index 99%
rename from k9mail/src/main/java/com/fsck/k9/view/AttachmentView.java
rename to k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java
index de3d27bf7..250c3ca13 100644
--- a/k9mail/src/main/java/com/fsck/k9/view/AttachmentView.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.view;
+package com.fsck.k9.ui.messageview;
 
 
 import java.io.File;
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 4ced13aaf..0722930d9 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,8 +47,7 @@ import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.mailstore.MessageViewInfo;
 import com.fsck.k9.ui.message.DecodeMessageLoader;
 import com.fsck.k9.ui.message.LocalMessageLoader;
-import com.fsck.k9.view.AttachmentView;
-import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
+import com.fsck.k9.ui.messageview.AttachmentView.AttachmentFileDownloadCallback;
 import com.fsck.k9.view.MessageHeader;
 
 import org.openintents.openpgp.OpenPgpSignatureResult;
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/SingleMessageView.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/SingleMessageView.java
index 5c8afbb12..586da1a9a 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/SingleMessageView.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/SingleMessageView.java
@@ -57,8 +57,7 @@ import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mailstore.MessageViewInfo;
 import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns;
 
-import com.fsck.k9.view.AttachmentView;
-import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
+import com.fsck.k9.ui.messageview.AttachmentView.AttachmentFileDownloadCallback;
 import com.fsck.k9.view.MessageHeader;
 import com.fsck.k9.view.MessageHeader.OnLayoutChangedListener;
 import com.fsck.k9.view.MessageWebView;
diff --git a/k9mail/src/main/res/layout/message_view_attachment.xml b/k9mail/src/main/res/layout/message_view_attachment.xml
index 1e338b21b..4be7cc56a 100644
--- a/k9mail/src/main/res/layout/message_view_attachment.xml
+++ b/k9mail/src/main/res/layout/message_view_attachment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.fsck.k9.view.AttachmentView
+<com.fsck.k9.ui.messageview.AttachmentView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -81,4 +81,4 @@
             android:layout_width="wrap_content"
             android:src="@drawable/ic_email_attachment" />
     </LinearLayout>
-</com.fsck.k9.view.AttachmentView>
+</com.fsck.k9.ui.messageview.AttachmentView>