diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp
index 659ec45be99..772996f6a8a 100644
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -682,7 +682,7 @@ NS_IMETHODIMP nsMsgDBView::GetCellProperties(PRInt32 aRow, const PRUnichar *colI
     return NS_MSG_INVALID_DBVIEW_INDEX;
   }
 
-  char    flags = m_flags.GetAt(aRow);
+  PRUint32 flags = m_flags.GetAt(aRow);
   if (!(flags & MSG_FLAG_READ))
     properties->AppendElement(kUnreadMsgAtom);  
 
diff --git a/themes/modern/messenger/threadPane.css b/themes/modern/messenger/threadPane.css
index aa59229444f..060d66aea7b 100644
--- a/themes/modern/messenger/threadPane.css
+++ b/themes/modern/messenger/threadPane.css
@@ -145,12 +145,12 @@ outlinerbody:-moz-outliner-image(subjectCol, unread) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, mail, imapdeleted) {
-  list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.gif");
+outlinerbody:-moz-outliner-image(subjectCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, mail, attach) {
-  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
+outlinerbody:-moz-outliner-image(subjectCol, imapdeleted) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.gif");
 }
 
 outlinerbody:-moz-outliner-image(subjectCol, news) {
@@ -160,3 +160,4 @@ outlinerbody:-moz-outliner-image(subjectCol, news) {
 outlinerbody:-moz-outliner-image(subjectCol, news, unread) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
 }
+