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

Conflicts:
	messagecomposer/autotests/composerviewbasetest.cpp
	templateparser/tests/templateparsertest.cpp

editor/kmcomposewin.h

@@ -615,6 +615,10 @@ private:
 
 private:
     int validateLineWrapWidth();
+    Akonadi::Collection mCollectionForNewMessage;
+    QMap<QByteArray, QString> mExtraHeaders;
+
+
     QWidget   *mMainWidget;
     MessageComposer::ComposerLineEdit *mEdtFrom, *mEdtReplyTo;
     PimCommon::LineEditWithAutoCorrection *mEdtSubject;
@@ -695,8 +699,6 @@ private:
     bool mCheckForForgottenAttachments;
     bool mIgnoreStickyFields;
     bool mWasModified;
-    Akonadi::Collection mCollectionForNewMessage;
-    QMap<QByteArray, QString> mExtraHeaders;
     CryptoStateIndicatorWidget *mCryptoStateIndicatorWidget;
     KMStorageService *mStorageService;
     bool mSendNowByShortcutUsed;