diff --git a/distributionlistdialog.cpp b/distributionlistdialog.cpp
index 4cf3f8d9f..5d7fdf32f 100644
--- a/distributionlistdialog.cpp
+++ b/distributionlistdialog.cpp
@@ -205,7 +205,7 @@ void DistributionListDialog::slotUser1()
   if ( ab->findDistributionListByName( name ) ) {
 #endif
     KMessageBox::information( this,
-      i18nc( "@info", "<para>Distribution list with the given name <placeholder>%1</placeholder> "
+      i18nc( "@info", "<para>Distribution list with the given name <resource>%1</resource> "
         "already exists. Please select a different name.</para>", name ) );
     return;
   }
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 46ea5a55a..44e0f2305 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -1357,7 +1357,7 @@ void KMMainWidget::slotRemoveFolder()
       }
       else {
         str = i18n("<qt>Are you sure you want to delete the empty folder "
-                   "<filename>%1</filename> and all its subfolders? Those subfolders might "
+                   "<resource>%1</resource> and all its subfolders? Those subfolders might "
                    "not be empty and their contents will be discarded as well. "
                    "<p><b>Beware</b> that discarded messages are not saved "
                    "into your Trash folder and are permanently deleted.</p></qt>",
@@ -1366,13 +1366,13 @@ void KMMainWidget::slotRemoveFolder()
     } else {
       if ( !mFolder->child() || mFolder->child()->isEmpty() ) {
         str = i18n("<qt>Are you sure you want to delete the folder "
-                   "<filename>%1</filename>, discarding its contents? "
+                   "<resource>%1</resource>, discarding its contents? "
                    "<p><b>Beware</b> that discarded messages are not saved "
                    "into your Trash folder and are permanently deleted.</p></qt>",
                 Qt::escape( mFolder->label() ) );
       }
       else {
-        str = i18n("<qt>Are you sure you want to delete the folder <filename>%1</filename> "
+        str = i18n("<qt>Are you sure you want to delete the folder <resource>%1</resource> "
                    "and all its subfolders, discarding their contents? "
                    "<p><b>Beware</b> that discarded messages are not saved "
                    "into your Trash folder and are permanently deleted.</p></qt>",
diff --git a/recipientseditor.cpp b/recipientseditor.cpp
index 2179b17ed..99e7ea3d9 100644
--- a/recipientseditor.cpp
+++ b/recipientseditor.cpp
@@ -820,9 +820,13 @@ void SideWidget::updateTotalToolTip()
     }
   }
 
-  text += i18nc("@info:tooltip", "<interface>To:</interface><nl/>") + to;
-  if ( !cc.isEmpty() ) text += i18nc("@info:tooltip", "<interface>CC:</interface><nl/>") + cc;
-  if ( !bcc.isEmpty() ) text += i18nc("@info:tooltip", "<interface>BCC:</interface><nl/>") + bcc;
+  text += i18nc("@info:tooltip %1 list of emails", "<interface>To:</interface><nl/>%1", to);
+  if ( !cc.isEmpty() ) {
+    text += i18nc("@info:tooltip %1 list of emails", "<interface>CC:</interface><nl/>%1", cc);
+  }
+  if ( !bcc.isEmpty() ) {
+    text += i18nc("@info:tooltip %1 list of emails", "<interface>BCC:</interface><nl/>%1", bcc);
+  }
 
   text.append( "</qt>" );
   mTotalLabel->setToolTip( text );