3 files changed, 4 insertions, 7 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index bc801dabf8..f498621852 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -160,9 +160,6 @@ action_mail_message_new_cb (GtkAction *action,
 
 	shell = e_shell_window_get_shell (shell_window);
 
-	if (!em_utils_check_user_can_send_mail ())
-		return;
-
 	/* Take care not to unnecessarily load the mail shell view. */
 	view_name = e_shell_window_get_active_view (shell_window);
 	if (g_strcmp0 (view_name, BACKEND_NAME) != 0)
@@ -268,9 +265,7 @@ mail_shell_backend_handle_uri_cb (EShell *shell,
 	gboolean handled = FALSE;
 
 	if (g_str_has_prefix (uri, "mailto:")) {
-		if (em_utils_check_user_can_send_mail ())
-			em_utils_compose_new_message_with_mailto (
-				shell, uri, NULL);
+		em_utils_compose_new_message_with_mailto (shell, uri, NULL);
 		handled = TRUE;
 	}
 
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index dc94c5c9ed..2427fc1ffd 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -123,6 +123,8 @@ action_mail_account_disable_cb (GtkAction *action,
 		e_account_list_remove (account_list, account);
 
 	e_account_list_save (account_list);
+
+	e_shell_view_update_actions (shell_view);
 }
 
 static void
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 5759b5830f..1e80e77a3c 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -990,7 +990,7 @@ mail_shell_view_update_actions (EShellView *shell_view)
 	gtk_action_set_sensitive (action, sensitive);
 
 	action = ACTION (MAIL_FOLDER_PROPERTIES);
-	sensitive = !folder_is_store;
+	sensitive = !folder_is_store && uri != NULL;
 	gtk_action_set_sensitive (action, sensitive);
 
 	action = ACTION (MAIL_FOLDER_REFRESH);