diff --git a/ChangeLog b/ChangeLog
index 725c93107..49a21d173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-29  Stefan Taferner  <taferner@kde.org>
+
+	* Config: writeConfig() was not called when windows
+	got closed. Now it is.
+
 1998-06-27  Markus Wuebben <markus@kde.org>
 
 	* kmcomposewin.cpp (applyChanges): add false to applyChanges to
diff --git a/kbusyptr.cpp b/kbusyptr.cpp
index 29559f11e..baab13fd3 100644
--- a/kbusyptr.cpp
+++ b/kbusyptr.cpp
@@ -51,6 +51,7 @@ void KBusyPtr :: busy (void)
       app->setOverrideCursor(cursorList[currentCursor]);
       if (animated) start(frameDelay);
     }
+    app->processEvents(200);
   }
   busyLevel++;
 }
@@ -66,6 +67,7 @@ void KBusyPtr :: idle (void)
   {
     stop();
     app->restoreOverrideCursor();
+    app->processEvents(200);
   }
 }
 
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 602dfcd34..ee75ac2ee 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -184,6 +184,8 @@ KMComposeWin::KMComposeWin(KMMessage *aMsg) : KMComposeWinInherited(),
 //-----------------------------------------------------------------------------
 KMComposeWin::~KMComposeWin()
 {
+  writeConfig();
+
   if (mAutoDeleteMsg && mMsg) delete mMsg;
 #ifdef HAS_KSPELL
   if (mKSpellConfig) delete KSpellConfig;
@@ -202,8 +204,7 @@ void KMComposeWin::readConfig(void)
   int w, h;
 
   config->setGroup("Composer");
-  mAutoSign = (stricmp(config->readEntry("signature"),"auto")==0);
-  cout << "auto:" << mAutoSign << endl;
+  mAutoSign = (stricmp(config->readEntry("signature","manual"),"auto")==0);
   mShowToolBar = config->readNumEntry("show-toolbar", 1);
   mSendImmediate = config->readNumEntry("send-immediate", -1);
   mDefEncoding = config->readEntry("encoding", "base64");
@@ -228,7 +229,7 @@ void KMComposeWin::readConfig(void)
   else
       mDefaultCharset=str;
       
-  cout << "Default charset: "<<mDefaultCharset<<"\n";    
+  debug("Default charset: %s", (const char*)mDefaultCharset);
       
   str = config->readEntry("composer-charset", "");
   if (str.isNull() || str=="default" || !KCharset(str).isDisplayable())
@@ -236,7 +237,7 @@ void KMComposeWin::readConfig(void)
   else
       mDefComposeCharset=str;
       
-  cout << "Default composer charset: "<<mDefComposeCharset<<"\n";    
+  debug("Default composer charset: %s", (const char*)mDefComposeCharset);
 #endif
 
   config->setGroup("Geometry");
@@ -776,11 +777,10 @@ bool KMComposeWin::applyChanges(void)
 
   //assert(mMsg!=NULL);
   if(!mMsg)
-    {
-      debug("KMComposeWin::applyChanges() : mMsg == NULL!\n");
-      return false;
-    }
-	    
+  {
+    debug("KMComposeWin::applyChanges() : mMsg == NULL!\n");
+    return FALSE;
+  }
 
   mMsg->setTo(to());
   mMsg->setFrom(from());
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index e085a7ea6..35e6aa0a4 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -118,6 +118,8 @@ KMMainWin::KMMainWin(QWidget *, char *name) :
 //-----------------------------------------------------------------------------
 KMMainWin::~KMMainWin()
 {
+  writeConfig();
+
   if (mHeaders)   delete mHeaders;
   if (mToolBar)   delete mToolBar;
   if (mMenuBar)   delete mMenuBar;
@@ -321,8 +323,10 @@ void KMMainWin::slotCompose()
   KMMessage* msg = new KMMessage;
   msg->initHeader();
 
+  kbp->busy();
   win = new KMComposeWin(msg);
   win->show();
+  kbp->idle();
 }