diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 247656183..0b9e51822 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -55,12 +55,15 @@
         android:entryValues="@array/prefValues_conversationListIcon"
         android:dialogTitle="@string/prefDialogTitle_conversationListIcon" />
 
+    <!-- TODO: Uncomment this when attachment previews are fully implemented. -->
+    <!--
     <CheckBoxPreference
         android:key="conversation_list_attachment_previews"
         android:persistent="false"
         android:defaultValue="true"
         android:title="@string/preference_attachment_previews_title"
         android:summary="@string/preference_attachment_previews_description" />
+    -->
 
     <!-- This may be removed in GeneralPreferences.java -->
     <CheckBoxPreference
diff --git a/src/com/android/email/activity/setup/GeneralPreferences.java b/src/com/android/email/activity/setup/GeneralPreferences.java
index 42597ce73..d485c258b 100644
--- a/src/com/android/email/activity/setup/GeneralPreferences.java
+++ b/src/com/android/email/activity/setup/GeneralPreferences.java
@@ -57,7 +57,7 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
     private CheckBoxPreference mConfirmDelete;
     private CheckBoxPreference mConfirmSend;
     private ListPreference mConvListIcon;
-    private CheckBoxPreference mConvListAttachmentPreviews;
+    //private CheckBoxPreference mConvListAttachmentPreviews;
     private CheckBoxPreference mSwipeDelete;
 
     private boolean mSettingsChanged = false;
@@ -165,10 +165,13 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
             mConvListIcon.setOnPreferenceChangeListener(this);
         }
 
+        // TODO: Uncomment this when attachment previews are fully implemented.
+        /*
         mConvListAttachmentPreviews = (CheckBoxPreference) findPreference(
                 PREFERENCE_KEY_CONV_LIST_ATTACHMENT_PREVIEWS);
         mConvListAttachmentPreviews.setChecked(mMailPrefs.getShowAttachmentPreviews());
         mConvListAttachmentPreviews.setOnPreferenceChangeListener(this);
+        */
 
         mConfirmDelete = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_DELETE);
         mConfirmSend = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_SEND);