2 files changed, 10 insertions, 1 deletions

diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index 153ba9d..7f1d8a0 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -58,25 +58,33 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 	attachments = new QListView(view);
 	attachments->setMinimumHeight(90);
 	attachments->setMaximumHeight(90);
 	attachments->setAllColumnsShowFocus(true);
 	attachments->addColumn("Mime Type", 60);
 	attachments->addColumn(tr("Description"), 100);
 	attachments->addColumn(tr("Filename"), 80);
     attachments->addColumn(tr("Size"), 80);
     attachments->setSorting(-1);
 	attachments->hide();
 
 	browser = new QTextBrowser(view);
 
 //	openDiag = new OpenDiag(view);
 //	openDiag->hide();
 
 }
 
 void ViewMailBase::slotChangeAttachview(bool state)
 {
 	if (state) attachments->show();
 	else attachments->hide();
 }
 
-
+void ViewMailBase::keyPressEvent ( QKeyEvent * e )
+{
+    if( e->key()==Qt::Key_Escape ) {
+        close();
+        e->accept();
+        return;
+    }
+    QWidget::keyPressEvent(e);
+}
diff --git a/noncore/net/mail/viewmailbase.h b/noncore/net/mail/viewmailbase.h
index 6d2a5b2..fdaad2a 100644
--- a/noncore/net/mail/viewmailbase.h
+++ b/noncore/net/mail/viewmailbase.h
@@ -8,30 +8,31 @@ class OpenDiag;
 class QListView;
 class QToolBar;
 class QTextBrowser;
 class QMenuBar;
 class QPopupMenu;
 
 class ViewMailBase : public QMainWindow
 {
 	Q_OBJECT
 
 public:
 	ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 
 protected:
 	QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml;
 	QListView *attachments;
 	QToolBar *toolbar;
 	QTextBrowser *browser;
 	OpenDiag *openDiag;
  	QMenuBar *menubar;
   QPopupMenu *mailmenu;
 
 protected slots:
 	void slotChangeAttachview(bool state);
+    virtual void keyPressEvent ( QKeyEvent * e );
 
 
 };
 
 #endif