Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	agents/followupreminderagent/followupreminderagent.cpp
	agents/followupreminderagent/followupremindermanager.h
	mobile/api/mail/CMakeLists.txt

editor/kmcomposewin.cpp

@@ -687,6 +687,11 @@ MessageComposer::Composer* KMComposeWin::createSimpleComposer()
     return mComposerBase->createSimpleComposer();
 }
 
+bool KMComposeWin::canSignEncryptAttachments() const
+{
+    return cryptoMessageFormat() != Kleo::InlineOpenPGPFormat;
+}
+
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotView( void )
 {

editor/kmcomposewin.h

@@ -588,9 +588,7 @@ private:
      */
     MessageComposer::Composer* createSimpleComposer();
 
-    bool canSignEncryptAttachments() const {
-        return cryptoMessageFormat() != Kleo::InlineOpenPGPFormat;
-    }
+    bool canSignEncryptAttachments() const;
 
     QString addQuotesToText( const QString &inputText ) const;
     // helper method for rethinkFields