--- mailbox_display.php.orig	2009-08-12 02:29:53.000000000 -0600
+++ mailbox_display.php	2009-09-06 03:20:53.000000000 -0600
@@ -260,37 +260,66 @@
                 $stuff = false;
                 $td_str = "<b><small>";
 
-                if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
-                    // i18n: "A" is short for "Answered". Make sure that two icon strings aren't translated to the same character (only in 1.5).
-                    $td_str .= _("A");
-                    $stuff = true;
-                }
-                if ($msg['TYPE0'] == 'multipart' && $msg['TYPE1'] == 'mixed') {
-                    $td_str .= '+';
-                    $stuff = true;
+                sq_change_text_domain('msg_flags');
+                if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) {
+                    $msg_alt = _("This message is flagged");
+                    $td_str .= '<img src="../plugins/msg_flags/images/flagged.gif" border="0" height="10" width="10" alt="'. $msg_alt .'" title="'. $msg_alt .'"> ';
                 }
                 if ($default_use_priority) {
                     if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
-                        $td_str .= "<font color=\"$color[1]\">!</font>";
-                        $stuff = true;
+                        $msg_alt = _("This message is high priority");
+                        $td_str .= '<img src="../plugins/msg_flags/images/prio_high.gif" border="0" height="10" width="5" alt="'. $msg_alt .'" title="'. $msg_alt .'"> ';
                     }
-                    if ($msg['PRIORITY'] == 5) {
-                        $td_str .= "<font color=\"$color[8]\">?</font>";
-                        $stuff = true;
+                    elseif ($msg['PRIORITY'] == 5) {
+                        $msg_alt = _("This message is low priority");
+                        $td_str .= '<img src="../plugins/msg_flags/images/prio_low.gif" border="0" height="10" width="5" alt="'. $msg_alt .'" title="'. $msg_alt .'"> ';
+                    }
+                    else {
+                        $td_str .= '<img src="../plugins/msg_flags/images/transparent.gif" border="0" height="10" width="6">';
                     }
                 }
+                if ($msg['TYPE0'] == 'multipart' && $msg['TYPE1'] == 'mixed') {
+                    $msg_alt = _("This message has an attachment");
+                    $td_str .= '<img src="../plugins/msg_flags/images/attach.gif" border="0" height="10" width="6" alt="'. $msg_alt .'" title="'. $msg_alt .'">';
+                }
+                else {
+                    $td_str .= '<img src="../plugins/msg_flags/images/transparent.gif" border="0" height="10" width="6">';
+                }
+
+                $msg_icon = '';
+
+                if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == true) {
+                    $msg_alt = _("This message has been read");
+                    $msg_icon .= '../plugins/msg_flags/images/msg_read';
+                } else {
+                    $msg_alt = _("This message is new");
+                    $msg_icon .= '../plugins/msg_flags/images/msg_new';
+                }
                 if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) {
-                    $td_str .= "<font color=\"$color[1]\">D</font>";
-                    $stuff = true;
+                    if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == true) {
+                        $msg_alt = _("This message has been read & deleted");
+                    } else {
+                        $msg_alt = _("This message is new & deleted");
+                    }
+                    $msg_icon .= '_deleted';
                 }
-                if (!$stuff) {
-                    $td_str .= '&nbsp;';
+                if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
+                    if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == true) {
+                        $msg_alt = _("This message has been read & answered");
+                    } else {
+                        $msg_alt = _("This message is new & answered");
+                    }
+                    $msg_icon .= '_reply';
                 }
+                sq_change_text_domain('squirrelmail');
+
+                $td_str .= '<img src="' . $msg_icon . '.gif" border="0" alt="'. $msg_alt . '" title="' . $msg_alt . '" height="12" width="18" ></small></b>&nbsp;';
+
                 do_hook("msg_envelope");
                 $td_str .= '</small></b>';
                 echo html_tag( 'td',
                                $td_str,
-                               'center',
+                               'right',
                                $hlt_color,
                                'nowrap' );
                 break;
@@ -760,6 +789,10 @@
         echo getButton('SUBMIT', 'expungeButton',_("Expunge")) ."\n";
     }
 
+    sq_change_text_domain('msg_flags');
+    echo getButton('SUBMIT', 'markFlagged',_("Flag"));
+    echo getButton('SUBMIT', 'markUnflagged',_("Unflag"));
+    sq_change_text_domain('squirrelmail');
     echo getButton('SUBMIT', 'markRead',_("Read")) . "\n";
     echo getButton('SUBMIT', 'markUnread',_("Unread")) . "\n";
     echo getButton('SUBMIT', 'delete',_("Delete")) ."&nbsp;\n";