diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp
index 605226eb9..052cfe4a7 100644
--- a/kmfoldertree.cpp
+++ b/kmfoldertree.cpp
@@ -847,7 +847,7 @@ void KMFolderTree::rightButtonPressed(QListViewItem *lvi, const QPoint &p, int)
     {
       folderMenu->insertSeparator();
       folderMenu->insertItem(i18n("Post to &Mailing-List"),
-                             topLevelWidget(), SLOT(slotCompose()));
+                             topLevelWidget(), SLOT(slotPostToML()));
     }
   }
 
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index 2342f7ae9..1dfe1a457 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -738,6 +738,26 @@ void KMMainWin::slotCompose()
   KMComposeWin *win;
   KMMessage* msg = new KMMessage;
 
+  if ( mFolder ) {
+      msg->initHeader( mFolder->identity() );
+
+      win = new KMComposeWin(msg, mFolder->identity());
+  } else {
+      msg->initHeader();
+      win = new KMComposeWin(msg);
+  }
+
+  win->show();
+
+}
+
+
+//-----------------------------------------------------------------------------
+void KMMainWin::slotPostToML()
+{
+  KMComposeWin *win;
+  KMMessage* msg = new KMMessage;
+
   if ( mFolder ) {
       msg->initHeader( mFolder->identity() );
 
@@ -1998,6 +2018,9 @@ void KMMainWin::setupMenuBar()
   (void) new KAction( i18n("&New Message..."), "filenew", KStdAccel::shortcut(KStdAccel::New), this,
 		      SLOT(slotCompose()), actionCollection(), "new_message" );
 
+  (void) new KAction( i18n("P&ost to Mailing-List..."), 0, this,
+		      SLOT(slotPostToML()), actionCollection(), "post_message" );
+
   (void) new KAction( i18n("next message","Ne&xt"), Key_N, this,
 		      SLOT(slotNextMessage()), actionCollection(), "next" );
 
@@ -2013,7 +2036,7 @@ void KMMainWin::setupMenuBar()
   replyAction = new KAction( i18n("&Reply..."), "mail_reply", Key_R, this,
 		      SLOT(slotReplyToMsg()), actionCollection(), "reply" );
 
-  noQuoteReplyAction = new KAction( i18n("Reply &Without Quote..."), ALT+Key_R,
+  noQuoteReplyAction = new KAction( i18n("Reply Without &Quote..."), ALT+Key_R,
     this, SLOT(slotNoQuoteReplyToMsg()), actionCollection(), "noquotereply" );
 
   replyAllAction = new KAction( i18n("Reply &All..."), "mail_replyall",
@@ -2025,7 +2048,7 @@ void KMMainWin::setupMenuBar()
   forwardAction = new KAction( i18n("&Forward..."), "mail_forward", Key_F, this,
 		      SLOT(slotForwardMsg()), actionCollection(), "forward" );
 
-  forwardAttachedAction = new KAction( i18n("F&orward as Attachment"), SHIFT+Key_F, this,
+  forwardAttachedAction = new KAction( i18n("For&ward as Attachment"), SHIFT+Key_F, this,
 		      SLOT(slotForwardAttachedMsg()), actionCollection(), "forward_attached" );
 
   redirectAction = new KAction( i18n("Re&direct..."), Key_E, this,
diff --git a/kmmainwin.h b/kmmainwin.h
index b58fa19bc..9d649132f 100644
--- a/kmmainwin.h
+++ b/kmmainwin.h
@@ -147,6 +147,7 @@ protected slots:
   void slotViewChange();
   void slotAddFolder();
   void slotCompose();
+  void slotPostToML();
   void slotModifyFolder();
   void slotExpireFolder();
   void slotExpireAll();
diff --git a/kmmainwin.rc b/kmmainwin.rc
index aea61c338..d8473af23 100644
--- a/kmmainwin.rc
+++ b/kmmainwin.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui >
-<kpartgui version="27" name="kmmainwin" >
+<kpartgui version="28" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -50,6 +50,7 @@
   <Menu noMerge="1" name="message" >
    <text>&amp;Message</text>
    <Action name="new_message" />
+   <Action name="post_message" />
    <Separator/>
    <Action name="next" />
    <Action name="next_unread" />