2 files changed, 18 insertions, 4 deletions

diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index b650c88..a02f73a 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -5,4 +5,6 @@
 #include <qvbox.h>
+#include <qpopupmenu.h>
 
 #include <qpe/qpetoolbar.h>
+#include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
@@ -19,2 +21,6 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         toolbar = new QPEToolBar(this);
+  menubar = new QPEMenuBar( toolbar );
+  mailmenu = new QPopupMenu( menubar );
+  menubar->insertItem( tr( "Mail" ), mailmenu );
+
         toolbar->setHorizontalStretchable(true);
@@ -22,4 +28,9 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
+        QLabel *spacer = new QLabel(toolbar);
+        spacer->setBackgroundMode(QWidget::PaletteButton);
+        toolbar->setStretchableWidget(spacer);
+
         reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
         reply->addTo(toolbar);
+         reply->addTo(mailmenu);
 
@@ -27,2 +38,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         forward->addTo(toolbar);
+        forward->addTo(mailmenu);
 
@@ -30,2 +42,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         attachbutton->addTo(toolbar);
+        attachbutton->addTo(mailmenu);
         connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
@@ -34,6 +47,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         deleteMail->addTo(toolbar);
-
-        QLabel *spacer = new QLabel(toolbar);
-        spacer->setBackgroundMode(QWidget::PaletteButton);
-        toolbar->setStretchableWidget(spacer);
+        deleteMail->addTo(mailmenu);
 
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 9ddf2aa..ba82017 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -10,2 +10,4 @@ class QPEToolBar;
 class QTextBrowser;
+class QPEMenuBar;
+class QPopupMenu;
 
@@ -24,2 +26,4 @@ protected:
         OpenDiag *openDiag;
+         QPEMenuBar *menubar;
+  QPopupMenu *mailmenu;