1 files changed, 4 insertions, 10 deletions

diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index c456ae5..6f6ab8e 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -8,12 +8,13 @@
 #include <qvbox.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
 
+#include "mailstatusbar.h"
 #include "listviewplus.h"
 #include "composerbase.h"
 
 ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
@@ -45,16 +46,12 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	connect(attachfile, SIGNAL(toggled(bool)), SLOT(slotAttachfileChanged(bool)));
 
 	addressbook = new QAction(tr("Addressbook"), QIconSet(Resource::loadPixmap("mail/addbook")), 0, 0, this);
 	addressbook->addTo(toolbar);
 	addressbook->addTo(mailmenu);
 
-	abort = new QAction(tr("Abort sending"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this);
-	abort->addTo(toolbar);
-	abort->addTo(mailmenu);
-
 	QWidget *main = new QWidget(this);
 	setCentralWidget(main);
 
 	QGridLayout *layout = new QGridLayout(main);
 
 	fromBox = new QComboBox(main);
@@ -120,14 +117,14 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	layout->addMultiCellWidget(view, 3, 3, 0, 1);
 
 	message = new QMultiLineEdit(view);
 	message->setMinimumHeight(30);
 
 	attachWindow = new QMainWindow(view, 0, 0);
-	attachWindow->setMinimumHeight(100);
-	attachWindow->setMaximumHeight(100);
+	attachWindow->setMinimumHeight(80);
+	attachWindow->setMaximumHeight(80);
 	attachWindow->setToolBarsMovable(false);
 	attachWindow->hide();
 
 	attachToolbar = new QPEToolBar(attachWindow);
 	attachToolbar->setVerticalStretchable(true);
 	
@@ -153,16 +150,13 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	attachPopup->insertItem(tr("Rename"), POPUP_ATTACH_RENAME);
 	attachPopup->insertItem(tr("Change Description"), POPUP_ATTACH_DESC);
 	attachPopup->insertSeparator();
 	attachPopup->insertItem(tr("Remove"), POPUP_ATTACH_REMOVE);
 	attachView->setPopup(attachPopup);
 
-	status = new QLabel(view);
-	QFont tmpFont = status->font();
-	tmpFont.setPixelSize(8);
-	status->setFont(tmpFont);
+	status = new MailStatusBar(view);
 }
 
 void ComposerBase::slotAttachfileChanged(bool toggled)
 {
 	if (toggled) {
 		if (attachWindow->isHidden()) attachWindow->show();