diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index a7f1e8f8ed..1e5d9cc56a 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -187,9 +187,9 @@ class mail_compose
 				'hint' => 'Save the drafted message as eml file into VFS'
 			)
 		);
-		foreach (self::$priorities as $priority)
+		foreach (self::$priorities as $key => $priority)
 		{
-			$actions['prty']['children'][$priority] = array(
+			$actions['prty']['children'][$key] = array(
 						'caption' => $priority,
 			);
 		}
diff --git a/mail/js/app.js b/mail/js/app.js
index 3b1e516062..09bf7c38b5 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4241,15 +4241,7 @@ app.classes.mail = AppJS.extend(
 				}
 				else if (action_event && toolbar.options)
 				{
-					var regex = new RegExp(toolbar.options.actions[action_event.id]['value']||'normal','ig');
-					jQuery(widget.options.select_options).each(function(_i,_a){
-						
-						if (_a.label.match(regex))
-						{
-							widget.set_value(_a.value);
-						}
-					})
-					
+					widget.set_value(toolbar.options.actions[action_event.id]['value']||'3');
 				}
 			}
 		}