From fb35fdb8c2cee91e626e8c519b11b82730b02763 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 20 Oct 2014 12:25:43 +0000
Subject: [PATCH] Fix cc, bcc fileds, sent from AB to an open compose dialog,
 overflow the others

---
 mail/js/app.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index d1d7a59796..71a4205d22 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -190,7 +190,7 @@ app.classes.mail = AppJS.extend(
 			case 'mail.compose':
 				var that = this;
 				this.mail_isMainWindow = false;
-				this.compose_fieldExpander_hide();
+				this.compose_fieldExpander_init();
 
 				// Set autosaving interval to 2 minutes for compose message
 				window.setInterval(function (){
@@ -200,7 +200,7 @@ app.classes.mail = AppJS.extend(
 				/* Control focus actions on subject to handle expanders properly.*/
 				jQuery("#mail-compose_subject").on({
 					focus:function(){
-						that.compose_fieldExpander_hide();
+						that.compose_fieldExpander_init();
 						that.compose_fieldExpander();
 					}
 				});
@@ -581,6 +581,7 @@ app.classes.mail = AppJS.extend(
 		if (content['cc'] || content['bcc'])
 		{
 			this.compose_fieldExpander();
+			this.compose_fieldExpander_init();
 		}
 		return success;
 	},
@@ -3617,10 +3618,10 @@ app.classes.mail = AppJS.extend(
 	},
 
 	/**
-	 * Hide Folder, Cc and Bcc rows from the compose popup
-	 *	-Only fields which have no content should get hidden
+	 * Set expandable fields (Folder, Cc and Bcc) based on their content
+	 * - Only fields which have no content should get hidden
 	 */
-	compose_fieldExpander_hide: function ()
+	compose_fieldExpander_init: function ()
 	{
 		var widgets = {
 			cc:{