Let Flagged take precence over for coloring purposes

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 0f4ef50..87e6827 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -1188,7 +1188,7 @@ $_prefs['msgflags'] = array(
         ),
 
         // IMAP flags
-        // KEY: IMAP flag as it exsits on the IMAP server
+        // KEY: IMAP flag as it exists on the IMAP server
         // VALUES (additional to base values):
         //   'n' - (boolean) [NOT match] Don't match the flag.
         //         DEFAULT: false
@@ -1219,6 +1219,18 @@ $_prefs['msgflags'] = array(
             // automatically set/reset when a message is drafted/finished.
             't' => 'imap'
         ),
+
+        // Forwarded flag (RFC 4550 [2.8])
+        '$forwarded' => array(
+            'a' => 'F',
+            'b' => '#aadddd',
+            'c' => 'flagForwarded',
+            'l' => _("Forwarded"),
+            // Pursuant to RFC, this flag SHOULD NOT be changed by the user
+            't' => 'imap'
+        ),
+
+        // Continued: System IMAP flags (RFC 3501 [2.3.2])
         '\\flagged' => array(
             'a' => '*',
             'b' => '#ffcccc',
@@ -1233,16 +1245,6 @@ $_prefs['msgflags'] = array(
             'l' => _("Deleted"),
             't' => 'imapu'
         ),
-
-        // Forwarded flag (RFC 4550 [2.8])
-        '$forwarded' => array(
-            'a' => 'F',
-            'b' => '#aadddd',
-            'c' => 'flagForwarded',
-            'l' => _("Forwarded"),
-            // Pursuant to RFC, this flag SHOULD NOT be changed by the user
-            't' => 'imap'
-        )
     )),
     'locked' => false,
     'shared' => false,

diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index 0744474..7aad554 100644 (file)
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -306,6 +306,9 @@ div.msgflags.flagAnswered, span.contextImg.flagAnswered {
 div.msgflags.flagDraft, span.contextImg.flagDraft {
     background-image: url("graphics/mail_draft.png");
 }
+div.msgflags.flagForwarded, span.contextImg.flagForwarded {
+    background-image: url("graphics/mail_forwarded.png");
+}
 div.msgflags.flagFlagged, span.contextImg.flagFlagged {
     background-image: url("graphics/mail_flagged.png");
 }
@@ -315,9 +318,6 @@ tr.flagDeleted * {
 div.msgflags.flagDeleted, span.contextImg.flagDeleted {
     background-image: url("graphics/mail_deleted.png");
 }
-div.msgflags.flagForwarded, span.contextImg.flagForwarded {
-    background-image: url("graphics/mail_forwarded.png");
-}
 
 /* Accounts/flag management (prefs) styles. */
 table.accountsmanagement, table.flagmanagement {

diff --git a/imp/themes/silver/screen.css b/imp/themes/silver/screen.css
index 5871775..d5f4a87 100644 (file)
--- a/imp/themes/silver/screen.css
+++ b/imp/themes/silver/screen.css
@@ -48,15 +48,15 @@ div.msgflags.flagAnswered, span.contextImg.flagAnswered {
 div.msgflags.flagDraft, span.contextImg.flagDraft {
     background-image: url("graphics/mail_draft.png");
 }
+div.msgflags.flagForwarded, span.contextImg.flagForwarded {
+    background-image: url("graphics/mail_forwarded.png");
+}
 div.msgflags.flagFlagged, span.contextImg.flagFlagged {
     background-image: url("graphics/mail_flagged.png");
 }
 div.msgflags.flagDeleted, span.contextImg.flagDeleted {
     background-image: url("graphics/mail_deleted.png");
 }
-div.msgflags.flagForwarded, span.contextImg.flagForwarded {
-    background-image: url("graphics/mail_forwarded.png");
-}
 
 span.folderImg {
     background-image: url("graphics/folders/folder.png");