- Fix message normal priority problem (#1485820)

2 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 711cf8da5..6f1bf3072 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix message normal priority problem (#1485820)
 - Fix autocomplete spinning wheel does not disappear (#1485804)
 - Added log_date_format option (#1485709)
 - Fix text wrapping in HTML editor after switching from plain text to HTML (#1485521)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 985c0e7a5..9739a9772 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -792,7 +792,12 @@ function rcmail_priority_selector($attrib)
                        rcube_label('highest')),
                  array(5, 4, 0, 2, 1));
                  
-  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE->headers->priority);
+  if (isset($_POST['_priority']))
+    $sel = $_POST['_priority'];
+  else if (intval($MESSAGE->headers->priority) != 3)
+    $sel = intval($MESSAGE->headers->priority);
+  else
+    $sel = 0;
 
   $out = $form_start ? "$form_start\n" : '';
   $out .= $selector->show($sel);