diff --git a/src/com/fsck/k9/view/AttachmentView.java b/src/com/fsck/k9/view/AttachmentView.java
index c7dc3841e..27ab0e657 100644
--- a/src/com/fsck/k9/view/AttachmentView.java
+++ b/src/com/fsck/k9/view/AttachmentView.java
@@ -46,16 +46,16 @@ import com.fsck.k9.provider.AttachmentProvider;
 
 public class AttachmentView extends FrameLayout implements OnClickListener, OnLongClickListener {
     private Context mContext;
-    public Button viewButton;
-    public Button downloadButton;
-    public LocalAttachmentBodyPart part;
+    private Button viewButton;
+    private Button downloadButton;
+    private LocalAttachmentBodyPart part;
     private Message mMessage;
     private Account mAccount;
     private MessagingController mController;
     private MessagingListener mListener;
-    public String name;
-    public String contentType;
-    public long size;
+    private String name;
+    private String contentType;
+    private long size;
 
     private AttachmentFileDownloadCallback callback;
 
@@ -89,6 +89,11 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
         public void showFileBrowser(AttachmentView caller);
     }
 
+    public void setButtonsEnabled(boolean enabled) {
+        viewButton.setEnabled(enabled);
+        downloadButton.setEnabled(enabled);
+    }
+
     /**
      * Populates this view with information about the attachment.
      * <p>
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 58a5821cf..2921ed494 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -607,8 +607,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     public void setAttachmentsEnabled(boolean enabled) {
         for (int i = 0, count = mAttachments.getChildCount(); i < count; i++) {
             AttachmentView attachment = (AttachmentView) mAttachments.getChildAt(i);
-            attachment.viewButton.setEnabled(enabled);
-            attachment.downloadButton.setEnabled(enabled);
+            attachment.setButtonsEnabled(enabled);
         }
     }