diff --git a/shell/main.c b/shell/main.c
index ac8bf6bb33..fe97b0fcd2 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -589,6 +589,12 @@ main (gint argc,
 		goto exit;
 	}
 
+	if (g_application_get_is_remote (G_APPLICATION (shell)) &&
+	    remaining_args && *remaining_args) {
+		e_shell_handle_uris (shell, (const gchar * const *) remaining_args, import_uris);
+		goto exit;
+	}
+
 	/* This routine converts the local mail store from mbox format to
 	 * Maildir format as needed.  The reason the code is here and not
 	 * in the mail module is because we inform the user at startup of