4 files changed, 11 insertions, 1 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index d2e887b..e16f853 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -78,13 +78,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
     editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) ,
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
     connect( editSettings, SIGNAL( activated() ),
              SLOT( slotEditSettings() ) );
-    editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) ,
+    editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) ,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
 
     //setCentralWidget( view );
 
     QVBox* wrapperBox = new QVBox( this );
@@ -128,12 +128,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
              SLOT( mailHold( int, QListViewItem *,const QPoint&,int  ) ) );
     connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
 
     QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
 }
 
+MainWindow::~MainWindow()
+{
+}
 
 void MainWindow::slotAdjustLayout() {
 
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 0e077f6..15d216a 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -16,12 +16,13 @@ class RecMail;
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
+    virtual ~MainWindow();
 
 public slots:
     virtual void slotAdjustColumns();
     
 protected slots:
     virtual void slotShowFolders( bool show );
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index fcd48e2..c888708 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -27,12 +27,17 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
 #endif
 
 
 
 }
 
+OpieMail::~OpieMail()
+{
+    if (settings) delete settings;
+}
+
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
     if (msg == "writeMail(QString,QString)") {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index ebed5d8..69b8d43 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -8,12 +8,13 @@
 class OpieMail : public MainWindow
 {
     Q_OBJECT
 
 public:
     OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
+    virtual ~OpieMail();
     static QString appName() { return QString::fromLatin1("opiemail"); }
 
 public slots:
     virtual void slotwriteMail(const QString&name,const QString&email);
     virtual void slotComposeMail();
     virtual void appMessage(const QCString &msg, const QByteArray &data);