diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 139dd94..f360fe2 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -930,7 +930,7 @@ static GtkActionEntry mail_entries[] = {
 	  NULL,
 	  N_("_Download Messages for Offline Usage"),
 	  NULL,
-	  N_("Download messages of accounts and folders marked for offline"),
+	  N_("Download messages of accounts and folders marked for offline usage"),
 	  G_CALLBACK (action_mail_download_cb) },
 
 	{ "mail-empty-trashes", /* this is File->Empty Trash action */
@@ -1403,6 +1403,7 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
 	EMailShellContent *mail_shell_content;
 	EShellView *shell_view;
 	EShellWindow *shell_window;
+	EShell *shell;
 	EShellSearchbar *searchbar;
 	EActionComboBox *combo_box;
 	GtkActionGroup *action_group;
@@ -1415,6 +1416,7 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
 
 	shell_view = E_SHELL_VIEW (mail_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
+	shell = e_shell_window_get_shell (shell_window);
 
 	mail_shell_content = mail_shell_view->priv->mail_shell_content;
 	searchbar = e_mail_shell_content_get_searchbar (mail_shell_content);
@@ -1513,6 +1515,10 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
 		ACTION (SEARCH_SAVE), "sensitive",
 		ACTION (MAIL_CREATE_SEARCH_FOLDER), "sensitive");
 
+	e_binding_new (
+		shell, "online",
+		ACTION (MAIL_DOWNLOAD), "sensitive");
+
 	g_signal_connect (
 		ACTION (GAL_SAVE_CUSTOM_VIEW), "activate",
 		G_CALLBACK (action_gal_save_custom_view_cb), mail_shell_view);
