Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kaddressbook/sendmail/mailsenderjob.cpp
	kmail/editor/kmcomposewin.cpp
	messagecomposer/utils/util.cpp

editor/kmcomposewin.cpp

@@ -62,6 +62,7 @@
 #include "followupreminder/followupreminderselectdatedialog.h"
 #include "followupreminder/followupremindercreatejob.h"
 #include "agents/followupreminderagent/followupreminderutil.h"
+#include "pimcommon/util/vcardutil.h"
 
 #include "libkdepim/progresswidget/statusbarprogresswidget.h"
 #include "libkdepim/progresswidget/progressstatusbarwidget.h"
@@ -2293,7 +2294,8 @@ void KMComposeWin::slotFetchJob(KJob *job)
                 attachmentName = contact.realName() + QLatin1String(".vcf");
                 //Workaround about broken kaddressbook fields.
                 QByteArray data = item.payloadData();
-                MessageComposer::Util::adaptVcard(data);
+                PimCommon::VCardUtil vcardUtil;
+                vcardUtil.adaptVcard(data);
                 addAttachment(attachmentName, KMime::Headers::CEbase64, QString(), data, "text/x-vcard");
             } else if (item.hasPayload<KContacts::ContactGroup>()) {
                 const KContacts::ContactGroup group = item.payload<KContacts::ContactGroup>();