- fields << MessageFilter::data(index, role).toString().mid(1);
- return QString("<%1").arg(fields.join(":"));
+
+ Message::Type messageType = (Message::Type)sourceModel()->data(source_index, MessageModel::TypeRole).toInt();
+ if(messageType & (Message::Plain | Message::Notice)) {
+ QString sender = MessageFilter::data(index, role).toString();
+ // we have to strip leading and traling < / >
+ fields << sender.mid(1, sender.count() - 2);
+ }
+ return QString("<%1>").arg(fields.join(":"));