diff --git a/res/drawable/attachment_text_box_dark.9.png b/res/drawable/attachment_text_box_dark.9.png
new file mode 100644
index 000000000..dec703464
Binary files /dev/null and b/res/drawable/attachment_text_box_dark.9.png differ
diff --git a/res/drawable/text_box.9.png b/res/drawable/attachment_text_box_light.9.png
similarity index 100%
rename from res/drawable/text_box.9.png
rename to res/drawable/attachment_text_box_light.9.png
diff --git a/res/layout/message_compose_attachment.xml b/res/layout/message_compose_attachment.xml
index 06cf18cc2..263d5a13c 100644
--- a/res/layout/message_compose_attachment.xml
+++ b/res/layout/message_compose_attachment.xml
@@ -18,7 +18,7 @@
 		android:textColor="?android:attr/textColorSecondary"
 		android:layout_width="1dip"
 		android:layout_height="42dip"
-		android:background="@drawable/text_box"
+		android:background="?attr/messageViewAttachmentBackground"
 		android:paddingLeft="36dip"
 		android:singleLine="true"
 		android:ellipsize="start"
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index 6d8612333..9b4279a47 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -11,7 +11,7 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/text_box"
+            android:background="?attr/messageViewAttachmentBackground"
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/attachment_icon"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index dc0ba11c6..1f43596d2 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -51,6 +51,7 @@
         <attr name="messageListActiveItemBackgroundColor" format="reference|color"/>
         <attr name="messageListDividerColor" format="reference|color"/>
         <attr name="messageViewHeaderBackgroundColor" format="reference|color"/>
+        <attr name="messageViewAttachmentBackground" format="reference"/>
 
     </declare-styleable>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1ebaaa9fa..b928c983c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -50,6 +50,7 @@
         <item name="messageListActiveItemBackgroundColor">#ff2ea7d1</item>
         <item name="messageListDividerColor">#ffcccccc</item>
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
+        <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -102,6 +103,7 @@
         <item name="messageListActiveItemBackgroundColor">#ff33b5e5</item>
         <item name="messageListDividerColor">#ff333333</item>
         <item name="messageViewHeaderBackgroundColor">#000000</item>
+        <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
index 4ecbe0585..a8fcfaadc 100644
--- a/src/com/fsck/k9/fragment/MessageViewFragment.java
+++ b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -77,6 +77,7 @@ public class MessageViewFragment extends SherlockFragment implements OnClickList
     private MessagingController mController;
     private Listener mListener = new Listener();
     private MessageViewHandler mHandler = new MessageViewHandler();
+    private LayoutInflater mLayoutInflater;
 
     /** this variable is used to save the calling AttachmentView
      *  until the onActivityResult is called.
@@ -172,8 +173,8 @@ public class MessageViewFragment extends SherlockFragment implements OnClickList
             Bundle savedInstanceState) {
         Context context = new ContextThemeWrapper(getActivity().getApplicationContext(),
                 K9.getK9ThemeResourceId(K9.getK9MessageViewTheme()));
-        LayoutInflater localInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View view = localInflater.inflate(R.layout.message, container, false);
+        mLayoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View view = mLayoutInflater.inflate(R.layout.message, container, false);
 
 
         mMessageView = (SingleMessageView) view.findViewById(R.id.message_view);
@@ -833,4 +834,8 @@ public class MessageViewFragment extends SherlockFragment implements OnClickList
     public boolean isInitialized() {
         return mInitialized ;
     }
+
+    public LayoutInflater getFragmentLayoutInflater() {
+        return mLayoutInflater;
+    }
 }
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 3892f1524..dd13fcde6 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -37,6 +37,7 @@ import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.crypto.CryptoProvider;
 import com.fsck.k9.crypto.PgpData;
+import com.fsck.k9.fragment.MessageViewFragment;
 import com.fsck.k9.helper.ClipboardManager;
 import com.fsck.k9.helper.Contacts;
 import com.fsck.k9.helper.HtmlConverter;
@@ -141,7 +142,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
 
         mContacts = Contacts.getInstance(activity);
 
-        mInflater = activity.getLayoutInflater();
+        mInflater = ((MessageViewFragment) fragment).getFragmentLayoutInflater();
         mDownloadRemainder = (Button) findViewById(R.id.download_remainder);
         mDownloadRemainder.setVisibility(View.GONE);
         mAttachmentsContainer.setVisibility(View.GONE);
@@ -162,6 +163,8 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
             TypedValue outValue = new TypedValue();
             getContext().getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
             mHeaderContainer.setBackgroundColor(outValue.data);
+            // also set background of the whole view (including the attachments view)
+            setBackgroundColor(outValue.data);
 
             mTitleBarHeaderContainer = new LinearLayout(activity);
             mMessageContentView.setEmbeddedTitleBarCompat(mTitleBarHeaderContainer);