X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=20cff0a51726c32652ac75eca7a717f522bd980c;hp=b191daa23921cb469c1316a789ec869e1a320c5d;hb=4f7bab9e1c193fff703bc6480b5c8ee24f34b898;hpb=5a7851e566dfb725811b7eb542bb203b6138faa7

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index b191daa..20cff0a 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -46,6 +46,7 @@
 #include "modest-platform.h"
 #include "modest-debug.h"
 #include <tny-mime-part.h>
+#include <tny-error.h>
 #include <tny-camel-folder.h>
 #include <tny-camel-imap-folder.h>
 #include <tny-camel-pop-folder.h>
@@ -3361,6 +3362,19 @@ do_create_folder_performer (gboolean canceled,
 	if (canceled || err) {
 		/* In memory full conditions we could get this error here */
 		check_memory_full_error ((GtkWidget *) parent_window, err);
+
+		/* This happens if we have selected the outbox folder
+		   as the parent */
+		if (err->code == TNY_SERVICE_ERROR_UNKNOWN &&
+		    TNY_IS_MERGE_FOLDER (helper->parent)) {
+			/* Show an error and retry */
+			modest_platform_information_banner ((GtkWidget *) parent_window,
+							    NULL,
+							    _("mail_in_ui_folder_create_error"));
+
+			do_create_folder (parent_window, helper->parent, helper->folder_name);
+		}
+
 		goto frees;
 	}