diff --git a/messagehelper.h b/messagehelper.h
index 556367b60..cd4821b2a 100644
--- a/messagehelper.h
+++ b/messagehelper.h
@@ -104,13 +104,6 @@ namespace MessageHelper {
 
   KMime::Message* createResend( KMime::Message *origMsg );
 
-  /** @return the UOID of the identity for this message.
-      Searches the "x-kmail-identity" header and if that fails,
-      searches with KPIMIdentities::IdentityManager::identityForAddress()
-      and if that fails queries the KMMsgBase::parent() folder for a default.
-   **/
-  uint identityUoid();
-
   KMime::Types::AddrSpecList extractAddrSpecs( KMime::Message* msg, const QByteArray & header );
 
   /** Check for prefixes @p prefixRegExps in #subject(). If none
diff --git a/templateparser.cpp b/templateparser.cpp
index 5510ae855..df59aa3c0 100644
--- a/templateparser.cpp
+++ b/templateparser.cpp
@@ -1028,22 +1028,22 @@ QString TemplateParser::findTemplate()
 
   QString tmpl;
 
-  if ( !mFolder ) { // find folder message belongs to
+  if ( !mFolder.isValid() ) { // find folder message belongs to
     mFolder = mMsg->parent();
-    if ( !mFolder ) {
+    if ( !mFolder.isValid() ) {
       if ( mOrigMsg ) {
         mFolder = mOrigMsg->parent();
       }
-      if ( !mFolder ) {
+      if ( !mFolder.isValid() ) {
         kDebug() << "Oops! No folder for message";
       }
     }
   }
   kDebug() << "Folder found:" << mFolder;
 
-  if ( mFolder )  // only if a folder was found
+  if ( mFolder.isValid() )  // only if a folder was found
   {
-    QString fid = mFolder->idString();
+    QString fid = QString::number( mFolder->id() );
     Templates fconf( fid );
     if ( fconf.useCustomTemplates() ) {   // does folder use custom templates?
       switch( mMode ) {