diff --git a/mail/js/app.js b/mail/js/app.js
index e486f66a6f..f1538426ca 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -257,8 +257,7 @@ app.mail = AppJS.extend(
 				settings.from = _action.id;
 		}
 
-		var window_name = settings.from + '_' + settings.id;
-		
+		var window_name = 'compose_' + (settings.from || '') + '_' + settings.id;
 		egw().open('','mail','add',settings,window_name);
 		return true;
 	},