diff --git a/ChangeLog b/ChangeLog
index 5f79b0ea5..55f8bcf31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1998-09-26  Stefan Taferner  <taferner@kde.org> (KMail-0.8.1)
 
+	* Fixed crash upon close of a main- or composer window.
+	Bug seems to be introduced by changed behaviour of KTMainWindow.
+	Still KMail crashes when you click on any message afterwards.
+
 	* Addressbook: finally fixed bug in not reading last line.
 	Thanks to all who reported!
 
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 3a9ae2d35..df39dc629 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -92,6 +92,7 @@ WindowList* windowList=new WindowList;
 #define HDR_STANDARD (HDR_SUBJECT|HDR_TO|HDR_CC)
 #endif
 
+QString KMComposeWin::mPathAttach = 0;
 
 //-----------------------------------------------------------------------------
 KMComposeWin::KMComposeWin(KMMessage *aMsg) : KMComposeWinInherited(),
diff --git a/kmcomposewin.h b/kmcomposewin.h
index 06c8dccf9..9e2d1f62a 100644
--- a/kmcomposewin.h
+++ b/kmcomposewin.h
@@ -313,7 +313,7 @@ protected:
   short mMnuIdUrgent, mMnuIdConfDeliver, mMnuIdConfRead;
   QString mForeColor, mBackColor, mBodyFont;
   QList<QLineEdit> mEdtList;
-  QString mPathAttach;
+  static QString mPathAttach;
 #ifdef HAS_KSPELL
   KSpell* mKSpell;
   KSpellConfig* mKSpellConfig;
diff --git a/kmtopwidget.cpp b/kmtopwidget.cpp
index 463cee0ea..350fab6cd 100644
--- a/kmtopwidget.cpp
+++ b/kmtopwidget.cpp
@@ -43,7 +43,7 @@ void KMTopLevelWidget::closeEvent(QCloseEvent* e)
   {
     writeConfig();
     e->ignore();
-    delete this;
+    //delete this;
   }
 }