diff --git a/res/values/strings.xml b/res/values/strings.xml
index a53317dcd..ddc2b17e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1155,4 +1155,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="global_settings_splitview_when_in_landscape">When in Landscape orientation</string>
 
     <string name="message_view_empty">Please select a message on the left</string>
+
+    <string name="global_settings_show_contact_picture_label">Show contact pictures</string>
+    <string name="global_settings_show_contact_picture_summary">Show contact pictures in the message list</string>
 </resources>
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index fb0d3e449..f44fc2c0a 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -179,6 +179,13 @@
                 android:dependency="messagelist_show_contact_name"
                 />
 
+            <CheckBoxPreference
+                android:persistent="false"
+                android:key="messagelist_show_contact_picture"
+                android:title="@string/global_settings_show_contact_picture_label"
+                android:summary="@string/global_settings_show_contact_picture_summary"
+                />
+
             <CheckBoxPreference
                 android:persistent="false"
                 android:key="messagelist_background_as_unread_indicator"
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index a0e2e2cb3..5afdf4ffa 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -226,6 +226,7 @@ public class K9 extends Application {
     private static boolean mShowContactName = false;
     private static boolean mChangeContactNameColor = false;
     private static int mContactNameColor = 0xff00008f;
+    private static boolean sShowContactPicture = true;
     private static boolean mMessageViewFixedWidthFont = false;
     private static boolean mMessageViewReturnToList = false;
     private static boolean mMessageViewShowNext = false;
@@ -506,6 +507,7 @@ public class K9 extends Application {
         editor.putBoolean("messageListCheckboxes", mMessageListCheckboxes);
         editor.putBoolean("showCorrespondentNames", mShowCorrespondentNames);
         editor.putBoolean("showContactName", mShowContactName);
+        editor.putBoolean("showContactPicture", sShowContactPicture);
         editor.putBoolean("changeRegisteredNameColor", mChangeContactNameColor);
         editor.putInt("registeredNameColor", mContactNameColor);
         editor.putBoolean("messageViewFixedWidthFont", mMessageViewFixedWidthFont);
@@ -703,6 +705,7 @@ public class K9 extends Application {
 
         mShowCorrespondentNames = sprefs.getBoolean("showCorrespondentNames", true);
         mShowContactName = sprefs.getBoolean("showContactName", false);
+        sShowContactPicture = sprefs.getBoolean("showContactPicture", true);
         mChangeContactNameColor = sprefs.getBoolean("changeRegisteredNameColor", false);
         mContactNameColor = sprefs.getInt("registeredNameColor", 0xff00008f);
         mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false);
@@ -1336,6 +1339,14 @@ public class K9 extends Application {
         sSplitViewMode = mode;
     }
 
+    public static boolean showContactPicture() {
+        return sShowContactPicture;
+    }
+
+    public static void setShowContactPicture(boolean show) {
+        sShowContactPicture = show;
+    }
+
     /**
      * Check if we already know whether all databases are using the current database schema.
      *
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index 74343b39f..fedf9c158 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -73,6 +73,7 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_MESSAGELIST_SHOW_CORRESPONDENT_NAMES = "messagelist_show_correspondent_names";
     private static final String PREFERENCE_MESSAGELIST_SHOW_CONTACT_NAME = "messagelist_show_contact_name";
     private static final String PREFERENCE_MESSAGELIST_CONTACT_NAME_COLOR = "messagelist_contact_name_color";
+    private static final String PREFERENCE_MESSAGELIST_SHOW_CONTACT_PICTURE = "messagelist_show_contact_picture";
     private static final String PREFERENCE_MESSAGEVIEW_FIXEDWIDTH = "messageview_fixedwidth_font";
 
     private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list";
@@ -124,6 +125,7 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mShowCorrespondentNames;
     private CheckBoxPreference mShowContactName;
     private CheckBoxPreference mChangeContactNameColor;
+    private CheckBoxPreference mShowContactPicture;
     private CheckBoxPreference mFixedWidth;
     private CheckBoxPreference mReturnToList;
     private CheckBoxPreference mShowNext;
@@ -266,6 +268,9 @@ public class Prefs extends K9PreferenceActivity {
         mShowContactName = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_SHOW_CONTACT_NAME);
         mShowContactName.setChecked(K9.showContactName());
 
+        mShowContactPicture = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_SHOW_CONTACT_PICTURE);
+        mShowContactPicture.setChecked(K9.showContactPicture());
+
         mBackgroundAsUnreadIndicator = (CheckBoxPreference)findPreference(PREFERENCE_BACKGROUND_AS_UNREAD_INDICATOR);
         mBackgroundAsUnreadIndicator.setChecked(K9.useBackgroundAsUnreadIndicator());
 
@@ -497,6 +502,7 @@ public class Prefs extends K9PreferenceActivity {
         K9.setShowCorrespondentNames(mShowCorrespondentNames.isChecked());
         K9.setMessageListSenderAboveSubject(mSenderAboveSubject.isChecked());
         K9.setShowContactName(mShowContactName.isChecked());
+        K9.setShowContactPicture(mShowContactPicture.isChecked());
         K9.setUseBackgroundAsUnreadIndicator(mBackgroundAsUnreadIndicator.isChecked());
         K9.setThreadedViewEnabled(mThreadedView.isChecked());
         K9.setChangeContactNameColor(mChangeContactNameColor.isChecked());
diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index a4f1c649c..6cbca58cf 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -750,8 +750,10 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
         mPreviewLines = K9.messageListPreviewLines();
         mCheckboxes = K9.messageListCheckboxes();
 
-        mContactsPictureLoader = new ContactPictureLoader(getActivity(),
-                R.drawable.ic_contact_picture);
+        if (K9.showContactPicture()) {
+            mContactsPictureLoader = new ContactPictureLoader(getActivity(),
+                    R.drawable.ic_contact_picture);
+        }
 
         restoreInstanceState(savedInstanceState);
         decodeArguments();
@@ -1733,7 +1735,14 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
             holder.date = (TextView) view.findViewById(R.id.date);
             holder.chip = view.findViewById(R.id.chip);
             holder.preview = (TextView) view.findViewById(R.id.preview);
-            holder.contactBadge = (QuickContactBadge) view.findViewById(R.id.contact_badge);
+
+            QuickContactBadge contactBadge =
+                    (QuickContactBadge) view.findViewById(R.id.contact_badge);
+            if (mContactsPictureLoader != null) {
+                holder.contactBadge = contactBadge;
+            } else {
+                contactBadge.setVisibility(View.GONE);
+            }
 
             if (mSenderAboveSubject) {
                 holder.from = (TextView) view.findViewById(R.id.subject);