--- mahogany-0.67.cvs/src/classes/MessageView.cpp	2006-09-04 20:27:41.000000000 +0200
+++ mahogany-0.67.wx26/src/classes/MessageView.cpp	2006-09-02 13:41:58.000000000 +0200
@@ -2454,7 +2454,7 @@
    CHECK( !cidOrig.empty(), false, "empty CID not allowed" );
 
    String cid;
-   if ( *cidOrig.begin() == '<' && *cidOrig.rbegin() == '>' )
+   if ( *cidOrig.begin() == '<' && cidOrig.length() == '>' )
       cid.assign(cidOrig, 1, cidOrig.length() - 2);
    else
       cid = cidOrig;