diff --git a/kmail_part.rc b/kmail_part.rc
index 0bbe3eab2..a143343ab 100644
--- a/kmail_part.rc
+++ b/kmail_part.rc
@@ -7,7 +7,7 @@
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
    <Menu name="file_new" >
-     <text>New</text>
+     <text context="@title:menu for new-message and new-from-template">New</text>
      <Action name="new_message" />
      <Action name="new_from_template" />
      <Separator/>
diff --git a/kmfilterdlg.cpp b/kmfilterdlg.cpp
index 35f8942d5..6d79a16a2 100644
--- a/kmfilterdlg.cpp
+++ b/kmfilterdlg.cpp
@@ -644,7 +644,7 @@ KMFilterListBox::KMFilterListBox( const QString & title, QWidget *parent,
   mBtnDelete->setIconSize( QSize( KIconLoader::SizeSmall, KIconLoader::SizeSmall ) );
   mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 );
   mBtnRename = new QPushButton( i18n("Rename..."), hb );
-  mBtnNew->setToolTip( i18n("New") );
+  mBtnNew->setToolTip( i18nc("@action:button in filter list manipulator", "New") );
   mBtnCopy->setToolTip( i18n("Copy") );
   mBtnDelete->setToolTip( i18n("Delete"));
   mBtnNew->setWhatsThis( i18n(_wt_filterlist_new) );
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index f1bbf02bb..e7b21a00c 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -2961,7 +2961,7 @@ void KMMainWidget::setupActions()
   {
     KAction *action = new KAction(KIcon("mail-message-new"), i18n("&New Message..."), this);
     actionCollection()->addAction("new_message", action );
-    action->setIconText( i18n( "New" ) );
+    action->setIconText( i18nc("@action:intoolbar New Empty Message", "New" ) );
     connect(action, SIGNAL(triggered(bool)), SLOT(slotCompose()));
     action->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::New));
   }
diff --git a/kmsearchpattern.h b/kmsearchpattern.h
index 8daaf003d..db79e989e 100644
--- a/kmsearchpattern.h
+++ b/kmsearchpattern.h
@@ -232,22 +232,22 @@ namespace KMail {
 
   // If you change the ordering here; also do it in the enum below
   static const MessageStatus StatusValues[] = {
-    { I18N_NOOP( "Important" ),        "emblem-important"    },
-    { I18N_NOOP( "New" ),              "mail-unread-new"     },
-    { I18N_NOOP( "Unread" ),           "mail-unread"         },
-    { I18N_NOOP( "Read" ),             "mail-read"           },
-    { I18N_NOOP( "Old" ),              0                     },
-    { I18N_NOOP( "Deleted" ),          "mail-deleted"        },
-    { I18N_NOOP( "Replied" ),          "mail-replied"        },
-    { I18N_NOOP( "Forwarded" ),        "mail-forwarded"      },
-    { I18N_NOOP( "Queued" ),           "mail-queued"         },
-    { I18N_NOOP( "Sent" ),             "mail-sent"           },
-    { I18N_NOOP( "Watched" ),          "mail-thread-watch"   },
-    { I18N_NOOP( "Ignored" ),          "mail-thread-ignored" },
-    { I18N_NOOP( "Spam" ),             "mail-mark-junk"      },
-    { I18N_NOOP( "Ham" ),              "mail-mark-notjunk"   },
-    { I18N_NOOP( "To Do" ),            "mail-task"           },
-    { I18N_NOOP( "Has Attachment"),    "mail-attachment"     }
+    { I18N_NOOP( "Important" ),              "emblem-important"    },
+    { I18N_NOOP2("message status", "New" ), "mail-unread-new"     },
+    { I18N_NOOP( "Unread" ),                 "mail-unread"         },
+    { I18N_NOOP( "Read" ),                   "mail-read"           },
+    { I18N_NOOP( "Old" ),                    0                     },
+    { I18N_NOOP( "Deleted" ),                "mail-deleted"        },
+    { I18N_NOOP( "Replied" ),                "mail-replied"        },
+    { I18N_NOOP( "Forwarded" ),              "mail-forwarded"      },
+    { I18N_NOOP( "Queued" ),                 "mail-queued"         },
+    { I18N_NOOP( "Sent" ),                   "mail-sent"           },
+    { I18N_NOOP( "Watched" ),                "mail-thread-watch"   },
+    { I18N_NOOP( "Ignored" ),                "mail-thread-ignored" },
+    { I18N_NOOP( "Spam" ),                   "mail-mark-junk"      },
+    { I18N_NOOP( "Ham" ),                    "mail-mark-notjunk"   },
+    { I18N_NOOP( "To Do" ),                  "mail-task"           },
+    { I18N_NOOP( "Has Attachment"),          "mail-attachment"     }
   };
   // If you change the ordering here; also do it in the array above
   enum StatusValueTypes {