diff --git a/mail/js/app.js b/mail/js/app.js
index 98e1b60b7f..e2cb40e0e9 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1246,7 +1246,7 @@ app.mail = AppJS.extend(
 	},
 
 	vfsUploadForImport: function(_egw, _widget, _window) {
-		console.log(_egw, _widget, _window);
+		//console.log(_egw, _widget, _window);
 		if (!jQuery.isEmptyObject(_widget.getValue()))
 		{
 			this.et2_obj.submit();
@@ -1255,7 +1255,15 @@ app.mail = AppJS.extend(
 
 	vfsUploadForCompose: function(_egw, _widget, _window)
 	{
-		console.log(_egw, _widget, _window);
+		//console.log(_egw, _widget, _window);
+		if (!jQuery.isEmptyObject(_widget.getValue()))
+		{
+			this.et2_obj.submit();
+		}
+	},
+
+	submitOnChange: function(_egw, _widget, _window) {
+		//console.log(_egw, _widget, _window);
 		if (!jQuery.isEmptyObject(_widget.getValue()))
 		{
 			this.et2_obj.submit();
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index f0bfe5aeac..bf94922646 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -58,7 +58,7 @@
 				</menulist>
 				<description value="Editor type"/>
 				<menulist>
-					<menupopup id="mimeType" onchange="1"/>
+					<menupopup id="mimeType" onchange="app.mail.submitOnChange"/>
 				</menulist>
 			</groupbox>
 			<groupbox class="et2_file mailUploadSection">