diff --git a/checkin_notes b/checkin_notes
index d555d2461d..1e5027fa66 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9310,3 +9310,8 @@ Janus	8 Oct 2007
 	database/
 	    bittorrent_peers.sql
 
+Rom    8 Oct 2007
+    - MGR: User errors are supposed to be red, not internal errors.
+    
+    clientgui/
+        ViewMessages.cpp, .h
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index 5512843963..a7718e5995 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -272,14 +272,17 @@ wxString CViewMessages::OnListGetItemText(long item, long column) const {
 
 wxListItemAttr* CViewMessages::OnListGetItemAttr(long item) const {
     wxListItemAttr* pAttribute  = NULL;
+    MESSAGE*        message     = wxGetApp().GetDocument()->message(item);
     wxString        strBuffer   = wxEmptyString;
 
-    FormatPriority(item, strBuffer);
-
-    if (wxT("E") == strBuffer) {
-        pAttribute = m_pMessageErrorAttr;
-    } else {
-        pAttribute = m_pMessageInfoAttr;
+    if (message) {
+        switch(message->priority) {
+        case MSG_USER_ERROR:
+            pAttribute = m_pMessageErrorAttr;
+            break;
+        default:
+            break;
+        }
     }
 
     return pAttribute;
@@ -318,28 +321,6 @@ wxInt32 CViewMessages::FormatProjectName(wxInt32 item, wxString& strBuffer) cons
 }
 
 
-wxInt32 CViewMessages::FormatPriority(wxInt32 item, wxString& strBuffer) const {
-    MESSAGE* message = wxGetApp().GetDocument()->message(item);
-
-    if (message) {
-        switch(message->priority) {
-        case MSG_INFO:
-            strBuffer = wxT("I");
-            break;
-        case MSG_USER_ERROR:
-            strBuffer = wxT("W");
-            break;
-        case MSG_INTERNAL_ERROR:
-        default:
-            strBuffer = wxT("E");
-            break;
-        }
-    }
-
-    return 0;
-}
-
-
 wxInt32 CViewMessages::FormatTime(wxInt32 item, wxString& strBuffer) const {
     wxDateTime dtBuffer;
     MESSAGE*   message = wxGetApp().GetDocument()->message(item);
@@ -357,7 +338,14 @@ wxInt32 CViewMessages::FormatMessage(wxInt32 item, wxString& strBuffer) const {
     MESSAGE*   message = wxGetApp().GetDocument()->message(item);
 
     if (message) {
-        strBuffer = wxString(message->body.c_str(), wxConvUTF8);
+        switch(message->priority) {
+        case MSG_INTERNAL_ERROR:
+            strBuffer = wxT("[error]") + wxString(message->body.c_str(), wxConvUTF8);
+            break;
+        default:
+            strBuffer = wxString(message->body.c_str(), wxConvUTF8);
+            break;
+        }
     }
 
     strBuffer.Replace(wxT("\n"), wxT(""), true);
diff --git a/clientgui/ViewMessages.h b/clientgui/ViewMessages.h
index 6569697ad4..c8f49f4c55 100644
--- a/clientgui/ViewMessages.h
+++ b/clientgui/ViewMessages.h
@@ -66,7 +66,6 @@ protected:
     virtual void            UpdateSelection();
 
     wxInt32                 FormatProjectName( wxInt32 item, wxString& strBuffer ) const;
-    wxInt32                 FormatPriority( wxInt32 item, wxString& strBuffer ) const;
     wxInt32                 FormatTime( wxInt32 item, wxString& strBuffer ) const;
     wxInt32                 FormatMessage( wxInt32 item, wxString& strBuffer ) const;