diff --git a/mail/js/app.js b/mail/js/app.js
index 7215a49b3b..17341fd66a 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3160,9 +3160,16 @@ app.classes.mail = AppJS.extend(
 			egw.debug('warn', "Move folder, but no target");
 			return;
 		}
+		var sourceProfile = _senders[0].id.split('::');
+		var targetProfile = destination.id.split('::');
+		if (sourceProfile[0]!=targetProfile[0])
+		{
+			egw.message(this.egw.lang('Moving Folders from one Mailaccount to another is not supported'),'error');
+			return;
+		}
 		var ftree = this.et2.getWidgetById(this.nm_index+'[foldertree]');
-		var src_label = _senders[0].id.replace(/^[0-9]::/,'');
-		var dest_label = destination.id.replace(/^[0-9]::/,'');
+		var src_label = _senders[0].id.replace(/^[0-9]+::/,'');
+		var dest_label = destination.id.replace(/^[0-9]+::/,'');
 		
 		var callback = function (_button)
 		{
@@ -3185,8 +3192,8 @@ app.classes.mail = AppJS.extend(
 				}
 			}
 		};
-		et2_dialog.show_dialog(callback, egw.lang('Are you sure you want to move folder %1 to folder %2?',
-			src_label, dest_label), 'Move folder', {},et2_dialog.BUTTONS_YES_NO,  et2_dialog.WARNING_MESSAGE);
+		et2_dialog.show_dialog(callback, this.egw.lang('Are you sure you want to move folder %1 to folder %2?',
+			src_label, dest_label), this.egw.lang('Move folder'), {},et2_dialog.BUTTONS_YES_NO,  et2_dialog.WARNING_MESSAGE);
 	},
 
 	/**
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 0777d93628..4f03c45c9d 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -43,6 +43,7 @@ append	mail	de	hinzufügen
 appended after reply before sending	mail	de	Einfügen nach dem zitierten Text im Zuge des Versendens
 application mail expected but got: %1	mail	de	Anwendung Mail erwarted, aber %1 erhalten!
 are you sure you want to delete all selected folders?	mail	de	Sollen alle selektierten Ordner gelöcht werden?
+are you sure you want to move folder %1 to folder %2?	mail	de	Soll der Ordner %1 in den Ordner %2 verschoben werden?
 arrival	mail	de	Empfangsdatum
 attach users vcard at compose to every new mail	mail	de	Füge die VCard des aktiven Benutzers an jede neue E-Mail an
 attach vcard	mail	de	vCard hinzufügen
@@ -193,6 +194,7 @@ flagged %1 messages as unflagged in %2	mail	de	Bei %1 Nachricht(en) wurde die Ma
 flagged / unflagged	mail	de	Markierung
 folder	mail	de	Ordner
 folder %1 %2 failed!	mail	de	Ordner %1 %2 fehlgeschlagen!
+folder %1 is moving to folder %2	mail	de	Ordner %1 wird in den Ordner %2 verschoben
 folder management ...	mail	de	Ordner Verwaltung ...
 folder settings	mail	de	Ordner Einstellungen
 for e.g.: mpeg	mail	de	z.B. mpeg
@@ -286,10 +288,12 @@ message saved successfully.	mail	de	Nachricht wurde erfolgreich gespeichert.
 message send failed: %1	mail	de	Nachricht konnte nicht versendet werden: %1
 message send successfully.	mail	de	Nachricht wurde erfolgreich versendet.
 miscellaneous	mail	de	Verschiedenes
+move folder	mail	de	Ordner verschieben
 move selected to	mail	de	Verschiebe ausgewählte nach
 move to	mail	de	verschieben
 move to trash	mail	de	in den Papierkorb verschieben
 moved %1 message(s) from %2 to %3	mail	de	%1 Nachrichten wurden von %2 nach %3 verschoben
+moving folders from one mailaccount to another is not supported	mail	de	Verschieben von Ordnern von einem Mailkonto zu einem anderen wird nicht unterstützt
 name of account	mail	de	Konten-Bezeichnung
 never display html emails	mail	de	niemals anzeigen
 new mail notification	mail	de	Benachrichtigung über neue E-Mails in:
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index fd675b56ed..40183e1bb2 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -43,6 +43,7 @@ append	mail	en	append
 appended after reply before sending	mail	en	Appended after reply before sending
 application mail expected but got: %1	mail	en	Application mail expected but got: %1
 are you sure you want to delete all selected folders?	mail	en	Are you sure you want to delete all selected folders?
+are you sure you want to move folder %1 to folder %2?	mail	en	Are you sure you want to move folder %1 to folder %2?
 arrival	mail	en	Recieved
 attach users vcard at compose to every new mail	mail	en	attach users VCard at compose to every new mail
 attach vcard	mail	en	Attach vCard
@@ -192,6 +193,7 @@ flagged %1 messages as unflagged in %2	mail	en	flagged %1 message(s) as unflagge
 flagged / unflagged	mail	en	Flagged / Unflagged
 folder	mail	en	Folder
 folder %1 %2 failed!	mail	en	Folder %1 %2 failed!
+folder %1 is moving to folder %2	mail	en	Folder %1 is moving to folder %2
 folder management ...	mail	en	Folder Management ...
 folder settings	mail	en	Folder settings
 for e.g.: mpeg	mail	en	for e.g.: mpeg
@@ -285,10 +287,12 @@ message saved successfully.	mail	en	Message saved successfully.
 message send failed: %1	mail	en	Message send failed: %1
 message send successfully.	mail	en	Message send successfully.
 miscellaneous	mail	en	Miscellaneous
+move folder	mail	en	Move Folder
 move selected to	mail	en	Move selected to
 move to	mail	en	Move to
 move to trash	mail	en	move to trash
 moved %1 message(s) from %2 to %3	mail	en	moved %1 message(s) from %2 to %3
+moving folders from one mailaccount to another is not supported	mail	en	Moving Folders from one Mailaccount to another is not supported
 name of account	mail	en	Name of account
 never display html emails	mail	en	never display html emails
 new mail notification	mail	en	New mail notification