From cb94c506d9bca9944bb1303bac3c97190b2511d8 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 16 Oct 2014 08:29:10 +0000
Subject: [PATCH] Fix hide handler of cc, bcc expander in compose

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

diff --git a/mail/js/app.js b/mail/js/app.js
index da5e56855c..170c425035 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3623,20 +3623,39 @@ app.classes.mail = AppJS.extend(
 
 	/**
 	 * Hide Folder, Cc and Bcc rows from the compose popup
-	 *
+	 *	-Only fields which have no content should get hidden
 	 */
 	compose_fieldExpander_hide: function ()
 	{
-		var widgets = {cc:{},bcc:{},folder:{}};
+		var widgets = {
+			cc:{
+				widget:{},
+				jQClass: '.mailComposeJQueryCc'
+			},
+			bcc:{
+				widget:{},
+				jQClass: '.mailComposeJQueryBcc'
+			},
+			folder:{
+				widget:{},
+				jQClass: '.mailComposeJQueryFolder'
+			}};
+		
 		for(var widget in widgets)
 		{
-			widgets[widget] = this.et2.getWidgetById(widget+'_expander');
-			if (typeof widgets[widget] != 'undefined')
+			var expanderBtn = widget + '_expander';
+			widgets[widget].widget = this.et2.getWidgetById(widget);
+			// Add expander button widget to the widgets object
+			widgets[expanderBtn] = {widget:this.et2.getWidgetById(expanderBtn)};
+			
+			if (typeof widgets[widget].widget != 'undefined' 
+					&& typeof widgets[expanderBtn].widget != 'undefined'
+					&& widgets[widget].widget.get_value().length == 0)
 			{
-				widgets[widget].set_disabled(false);
+				widgets[expanderBtn].widget.set_disabled(false);
+				jQuery(widgets[widget].jQClass).hide();
 			}
 		}
-		jQuery(".mailComposeJQueryCc,.mailComposeJQueryBcc,.mailComposeJQueryFolder").hide();
 	},
 
 	/**