3 files changed, 11 insertions, 36 deletions

diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index ecb295ea10..8535e834b8 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -379,10 +379,8 @@ mail_shell_backend_window_added_cb (GtkApplication *application,
 
 		settings = g_settings_new ("org.gnome.evolution.mail");
 
-		/* Express mode does not honor this setting. */
-		if (!e_shell_get_express_mode (shell))
-			active = g_settings_get_boolean (
-				settings, "composer-send-html");
+		active = g_settings_get_boolean (
+			settings, "composer-send-html");
 
 		g_object_unref (settings);
 
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 12667c2761..08dda8242d 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -85,15 +85,6 @@ reconnect_folder_loaded_event (EMailReader *child,
 }
 
 static void
-mail_shell_content_view_changed_cb (EMailView *view,
-                                    EMailShellContent *content)
-{
-	g_object_freeze_notify (G_OBJECT (content));
-	g_object_notify (G_OBJECT (content), "group-by-threads");
-	g_object_thaw_notify (G_OBJECT (content));
-}
-
-static void
 mail_shell_content_set_property (GObject *object,
                                  guint property_id,
                                  const GValue *value,
@@ -194,14 +185,7 @@ mail_shell_content_constructed (GObject *object)
 
 	container = GTK_WIDGET (object);
 
-	if (e_shell_get_express_mode (e_shell_get_default ())) {
-		widget = e_mail_notebook_view_new (shell_view);
-		g_signal_connect (
-			widget, "view-changed",
-			G_CALLBACK (mail_shell_content_view_changed_cb),
-			object);
-	} else
-		widget = e_mail_paned_view_new (shell_view);
+	widget = e_mail_paned_view_new (shell_view);
 
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	priv->mail_view = g_object_ref (widget);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index a2e1628299..57de8ab8f6 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -317,16 +317,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 
 	/* Default Behavior */
 
-	/* Express mode does not honor this setting. */
 	widget = e_builder_get_widget (prefs->builder, "chkSendHTML");
-	if (e_shell_get_express_mode (shell)) {
-		gtk_widget_hide (widget);
-	} else {
-		g_settings_bind (
-			settings, "composer-send-html",
-			widget, "active",
-			G_SETTINGS_BIND_DEFAULT);
-	}
+	g_settings_bind (
+		settings, "composer-send-html",
+		widget, "active",
+		G_SETTINGS_BIND_DEFAULT);
 
 	widget = e_builder_get_widget (prefs->builder, "chkPromptEmptySubject");
 	g_settings_bind (
@@ -496,12 +491,10 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 		widget, "editor-created",
 		G_CALLBACK (gtk_application_add_window), shell);
 
-	/* Express mode does not honor this setting. */
-	if (!e_shell_get_express_mode (shell))
-		g_settings_bind (
-			settings, "composer-send-html",
-			widget, "prefer-html",
-			G_SETTINGS_BIND_GET);
+	g_settings_bind (
+		settings, "composer-send-html",
+		widget, "prefer-html",
+		G_SETTINGS_BIND_GET);
 
 	/* get our toplevel widget */
 	target = em_config_target_new_prefs (ec);