diff --git a/mail/js/app.js b/mail/js/app.js
index 4afc1c7e15..cccecb37f3 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4128,7 +4128,7 @@ app.classes.mail = AppJS.extend(
 	 * - make them draggable
 	 * - check if we have keys for recipients, if we compose an encrypted mail
 	 **/
-	set_dragging_dndCompose: function ()
+	recipients_onchange: function()
 	{
 		// if we compose an encrypted mail, check if we have keys for new recipient
 		if (this.mailvelope_editor)
@@ -4139,6 +4139,14 @@ app.classes.mail = AppJS.extend(
 				self.egw.message(_err.message, 'error');
 			});
 		}
+		this.set_dragging_dndCompose();
+	},
+
+	/**
+	 * Make recipients draggable
+	 */
+	set_dragging_dndCompose: function ()
+	{
 		var zIndex = 100;
 		var dragItems = jQuery('div.ms-sel-item:not(div.ui-draggable)');
 		dragItems.each(function(i,item){
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index ffed21997f..4ff56ee26c 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -54,7 +54,7 @@
 					</row>
 					<row class="mailComposeHeaders" >
 						<description value="To"/>
-						<taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.set_dragging_dndCompose"/>
+						<taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.recipients_onchange"/>
 						<vbox>
 							<description id="cc_expander" value="Cc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
 							<description id="bcc_expander" value="Bcc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
@@ -62,12 +62,12 @@
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryCc">
 						<description value="Cc"/>
-						<taglist-email id="cc" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.set_dragging_dndCompose"/>
+						<taglist-email id="cc" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.recipients_onchange"/>
 						<description/>
 					</row>
 					<row  class="mailComposeHeaders mailComposeJQueryBcc">
 						<description value="Bcc"/>
-						<taglist-email id="bcc" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.set_dragging_dndCompose"/>
+						<taglist-email id="bcc" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.recipients_onchange"/>
 						<description/>
 					</row>
 					<row class="mailComposeHeaders">