From 417e03022c72f993561581ff9088093a4f886ac0 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 14 Jan 2015 13:18:28 +0100
Subject: [PATCH 1/2] Use exportVCards here

---
 editor/kmcomposewin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp
index 7f85e92ae..916df7a0d 100644
--- a/editor/kmcomposewin.cpp
+++ b/editor/kmcomposewin.cpp
@@ -2357,7 +2357,7 @@ void KMComposeWin::slotExpandGroupResult(KJob *job)
     const QString attachmentName = expandJob->property("groupName").toString();
     const QByteArray mimeType = "text/x-vcard";
     KABC::VCardConverter converter;
-    const QByteArray groupData = converter.createVCards(expandJob->contacts());
+    const QByteArray groupData = converter.exportVCards(expandJob->contacts(), KABC::VCardConverter::v3_0);
     if (!groupData.isEmpty()) {
         addAttachment( attachmentName, KMime::Headers::CEbase64, QString(), groupData, mimeType );
     }

From b8f58cb15e6be87b64fb51e4ab1808ed1f6e8234 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 14 Jan 2015 23:07:11 +0100
Subject: [PATCH 2/2] Try to fix Bug 342803 - kmail tray icon tiny with QHD
 display

BUG: 342803
---
 kmsystemtray.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kmsystemtray.cpp b/kmsystemtray.cpp
index 9dd40f6c4..662342fb0 100644
--- a/kmsystemtray.cpp
+++ b/kmsystemtray.cpp
@@ -205,7 +205,10 @@ void KMSystemTray::updateCount()
         return;
     }
     if (mShowUnreadMailCount) {
-        const int overlaySize = KIconLoader::SizeSmallMedium;
+        int overlaySize = KIconLoader::SizeSmallMedium;
+        if (!mIcon.availableSizes().isEmpty()) {
+            overlaySize = mIcon.availableSizes().at(0).width();
+        }
 
         const QString countString = QString::number( mCount );
         QFont countFont = KGlobalSettings::generalFont();