Commit 3ab75066 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/Applications/16.04'

parents c5129089 bb8aa0e7
......@@ -402,7 +402,7 @@ QString emailAddrAsAnchor(const KMime::Types::Mailbox::List &mailboxList,
+ QString::fromLatin1(QUrl::toPercentEncoding(KEmailAddress::encodeMailtoUrl(mailbox.prettyAddress(KMime::Types::Mailbox::QuoteWhenNecessary)).path()))
+ QLatin1String("\" ") + cssStyle + QLatin1Char('>');
}
const bool foundMe = im->identityForAddress(mailbox.prettyAddress()) != KIdentityManagement::Identity::null();
const bool foundMe = (im->identities().count() == 1) && (im->identityForAddress(mailbox.prettyAddress()) != KIdentityManagement::Identity::null());
const QString i18nMe = i18nc("signal that this email is defined in my identity", "Me");
if (display == DisplayNameOnly) {
if (!mailbox.name().isEmpty()) { // Fallback to the email address when the name is not set.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment