--- a/modules/mail/e-mail-shell-settings.c	2011-03-29 20:38:48.000000000 +0200
+++ b/modules/mail/e-mail-shell-settings.c	2016-07-28 19:15:42.965035327 +0200
@@ -159,6 +159,10 @@ e_mail_shell_settings_init (EShell *shel
 		"/apps/evolution/mail/display/show_real_date");
 
 	e_shell_settings_install_property_for_key (
+		"mail-display-content-disposition-inline",
+		"/apps/evolution/mail/display/display_content_disposition_inline");
+
+	e_shell_settings_install_property_for_key (
 		"mail-prompt-delete-in-vfolder",
 		"/apps/evolution/mail/prompts/delete_in_vfolder");
 
--- a/modules/mail/em-mailer-prefs.c	2011-03-29 20:38:48.000000000 +0200
+++ b/modules/mail/em-mailer-prefs.c	2016-07-28 19:39:54.396115919 +0200
@@ -932,6 +932,11 @@ em_mailer_prefs_construct (EMMailerPrefs
 		shell_settings, "mail-enable-search-folders",
 		widget, "active");
 
+	widget = e_builder_get_widget (prefs->builder, "chkDisplayContentDispositionInline");
+	e_mutual_binding_new (
+		shell_settings, "mail-display-content-disposition-inline",
+		widget, "active");
+
 	/* Deleting Mail */
 	widget = e_builder_get_widget (prefs->builder, "chkEmptyTrashOnExit");
 	e_mutual_binding_new (
--- a/mail/evolution-mail.schemas.in	2011-03-29 20:38:48.000000000 +0200
+++ b/mail/evolution-mail.schemas.in	2016-07-29 04:04:00.234907961 +0200
@@ -364,6 +364,19 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/evolution/mail/display/display_content_disposition_inline</key>
+      <applyto>/apps/evolution/mail/display/display_content_disposition_inline</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Enable or disable display of inline content</short>
+         <long> Disable this to block automatic display of attachments with Content-Disposition: inline
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/evolution/mail/display/global_view_setting</key>
       <applyto>/apps/evolution/mail/display/global_view_setting</applyto>
       <owner>evolution-mail</owner>
--- a/mail/mail-config.ui	2011-03-29 20:38:48.000000000 +0200
+++ b/mail/mail-config.ui	2016-07-29 03:20:28.264567606 +0200
@@ -3339,6 +3339,20 @@ For example: "Work" or "Personal"</prope
                             <property name="position">7</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkCheckButton" id="chkDisplayContentDispositionInline">
+                            <property name="label" translatable="yes">Display inline content</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">8</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                   </object>
--- a/em-format/em-format.c	2011-03-29 20:38:47.000000000 +0200
+++ b/em-format/em-format.c	2016-07-30 16:25:14.801349424 +0200
@@ -1153,6 +1154,11 @@ em_format_is_inline (EMFormat *emf,
                      const EMFormatHandler *handle)
 {
 	EMFormatClass *class;
+	GConfClient *client = gconf_client_get_default ();
+
+	if (!gconf_client_get_bool(client, (const gchar*)"/apps/evolution/mail/display/display_content_disposition_inline", NULL)) {
+		return FALSE;
+	}
 
 	g_return_val_if_fail (EM_IS_FORMAT (emf), FALSE);
 	g_return_val_if_fail (part_id != NULL, FALSE);
