1 files changed, 9 insertions, 0 deletions

diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 6627701..ff00a73 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -10,2 +10,3 @@
 #include <qpe/qpetoolbar.h>
+#include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
@@ -22,2 +23,5 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         toolbar = new QPEToolBar(this);
+  menubar = new QPEMenuBar( toolbar );
+  mailmenu = new QPopupMenu( menubar );
+  menubar->insertItem( tr( "Mail" ), mailmenu );
         addToolBar(toolbar);
@@ -27,2 +31,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         sendmail->addTo(toolbar);
+        sendmail->addTo(mailmenu);
 
@@ -30,2 +35,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         queuemail->addTo(toolbar);
+        queuemail->addTo(mailmenu);
 
@@ -33,2 +39,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         attachfile->addTo(toolbar);
+        attachfile->addTo(mailmenu);
         connect(attachfile, SIGNAL(toggled(bool)), SLOT(slotAttachfileChanged(bool)));
@@ -37,2 +44,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         addressbook->addTo(toolbar);
+        addressbook->addTo(mailmenu);
 
@@ -44,2 +52,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         abort->addTo(toolbar);
+        abort->addTo(mailmenu);