diff --git a/etemplate/js/et2_widget_toolbar.js b/etemplate/js/et2_widget_toolbar.js
index 41ac30da68..3a3c738b9b 100644
--- a/etemplate/js/et2_widget_toolbar.js
+++ b/etemplate/js/et2_widget_toolbar.js
@@ -111,12 +111,12 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 		if (pref && !jQuery.isArray(pref)) this.preference = pref;
 
 		//Set the default actions for the first time
-		if (typeof pref === 'undefined' || jQuery.isEmptyObject(pref))
+		if (typeof pref === 'undefined')
 		{
 			for (var name in actions)
 			{
 				if (!actions[name].toolbarDefault &&
-						(typeof actions[name].children === 'undefined' || !this.flat_list))
+						(typeof actions[name].children === 'undefined' || !this.options.flat_list))
 					this.set_prefered(actions[name].id,'add');
 			}
 		}
@@ -294,7 +294,15 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 			helper:"clone",
 			appendTo:'body',
 			zIndex: 1000,
-			cursor:"move"
+			cursor:"move",
+			start: function()
+			{
+				jQuery(that.actionlist).addClass('et2_toolbarDropArea');
+			},
+			stop: function()
+			{
+				jQuery(that.actionlist).removeClass('et2_toolbarDropArea');
+			},
 		});
 		toolbox.children().droppable({
 			accept:toolbar,
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index ebbed90208..f7fac5cc6e 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -1073,6 +1073,10 @@ div.message.floating {
 		width: 100% !important;
 		height: auto;
 	}
+	#cke_1_top.cke_top {
+		display: none;
+		border:none;
+	}
 }
 /**
  * Grid / nextmatch Hierarchy
@@ -1459,6 +1463,11 @@ div.ui-toolbar-menulist{
 }
 .et2_toolbar_actionlist{
 	float:left;
+	width:80%;
+	height:24px;
+}
+.et2_toolbarDropArea{
+	border: 1px dashed lightgray;
 }
 .et2_label > input.et2_checkbox {
 	margin-right: 5px;
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index f88d545ae2..3e2bff8513 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -491,6 +491,9 @@ div.mail-compose_fileselector {
 	padding: 0px;
 	height: 16px !important;
 }
+#mail-index_toolbar > #toolbar-actionlist {
+	width:auto;
+}
 #mail-index_mailPreviewContainer {
 	position: absolute;
 	border: 1px solid silver;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 88848c9630..b706162eed 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -491,6 +491,9 @@ div.mail-compose_fileselector {
   padding: 0px;
   height: 16px !important;
 }
+#mail-index_toolbar > #toolbar-actionlist {
+  width: auto;
+}
 #mail-index_mailPreviewContainer {
   position: absolute;
   border: 1px solid silver;