diff --git a/kmcomposerui.rc b/kmcomposerui.rc
index b744f65c8..d4c2bd069 100644
--- a/kmcomposerui.rc
+++ b/kmcomposerui.rc
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui ><kpartgui name="kmcomposer" >
+<!DOCTYPE kpartgui ><kpartgui name="kmcomposer" version="1">
 <MenuBar>
 <Menu noMerge="1" name="file" >
 <text>
@@ -64,7 +64,7 @@ Message &amp;Options</text>
 <Action name="options_configure_toolbars" />
 </Menu>
 </MenuBar>
-<ToolBar noMerge="1" name="mainToolBar" >
+<ToolBar noMerge="1" name="mainToolBar" fullWidth="true" >
 <Action name="send_default" />
 <Action name="send_alternative" />
 <Separator/>
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index e8b486e65..7baa91910 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -1288,7 +1288,7 @@ void KMMainWin::setupMenuBar()
   connect(actMenu,SIGNAL(activated(int)),this,SLOT(slotCheckOneAccount(int)));
 
   (void) new KAction( i18n("Send &Queued"), 0, this, 
-		      SLOT(slotSendQueued()), actionCollection(), "");
+		      SLOT(slotSendQueued()), actionCollection(), "send_queued");
 
   (void) new KAction( i18n("Configuration..."), 0, this, 
 		      SLOT(slotSettings()), actionCollection(), "settings" );
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index 8b8c55e14..dc8cd2317 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -301,6 +301,9 @@ void KMReaderWin::initHtmlWidget(void)
   connect(mViewer->browserExtension(),
 	  SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this,
   	  SLOT(slotUrlOpen(const KURL &, const KParts::URLArgs &)));
+  connect(mViewer->browserExtension(),
+	  SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this,
+  	  SLOT(slotUrlOpen(const KURL &, const KParts::URLArgs &)));
   connect(mViewer,SIGNAL(onURL(const QString &)),this,
 	  SLOT(slotUrlOn(const QString &)));
     connect(mViewer,SIGNAL(popupMenu(const QString &, const QPoint &)),
@@ -583,7 +586,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   }
   else // if numBodyParts <= 0
   {
-    if (htmlMail() && (type.find("text/html;") != -1))
+    if (htmlMail() && ((type == "text/html") || (type.find("text/html") != -1)))
       mViewer->write(aMsg->bodyDecoded());
     else
       writeBodyStr(aMsg->bodyDecoded());