diff --git a/attachmentmissingwarning.cpp b/attachmentmissingwarning.cpp
index 0cf480dc5..c89a09327 100644
--- a/attachmentmissingwarning.cpp
+++ b/attachmentmissingwarning.cpp
@@ -48,7 +48,12 @@ AttachmentMissingWarning::~AttachmentMissingWarning()
 void AttachmentMissingWarning::slotAttachFile()
 {
   Q_EMIT attachMissingFile();
+}
+
+void AttachmentMissingWarning::slotFileAttached()
+{
   setVisible(false);
+  Q_EMIT closeAttachMissingFile();
 }
 
 void AttachmentMissingWarning::explicitlyClosed()
diff --git a/attachmentmissingwarning.h b/attachmentmissingwarning.h
index 37db94814..663a8cd05 100644
--- a/attachmentmissingwarning.h
+++ b/attachmentmissingwarning.h
@@ -28,6 +28,7 @@ public:
 private Q_SLOTS:
   void explicitlyClosed();
   void slotAttachFile();
+  void slotFileAttached();
 Q_SIGNALS:
   void attachMissingFile();
   void closeAttachMissingFile();
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index cfd85335e..6db3e6284 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -430,6 +430,7 @@ KMComposeWin::KMComposeWin( const KMime::Message::Ptr &aMsg, bool lastSignState,
   m_verifyMissingAttachment = new QTimer(this);
   m_verifyMissingAttachment->start(1000*30);
   connect( m_verifyMissingAttachment, SIGNAL(timeout()), this, SLOT(slotVerifyMissingAttachmentTimeout()) );
+  connect( attachmentController, SIGNAL( fileAttached() ), mAttachmentMissing, SLOT(slotFileAttached()) );
 
   readConfig();
   setupStatusBar(attachmentView->widget());
@@ -3441,9 +3442,11 @@ void KMComposeWin::slotAttachMissingFile()
 
 void KMComposeWin::slotCloseAttachMissingFile()
 {
-  m_verifyMissingAttachment->stop();
-  delete m_verifyMissingAttachment;
-  m_verifyMissingAttachment = 0;
+  if(m_verifyMissingAttachment) {
+    m_verifyMissingAttachment->stop();
+    delete m_verifyMissingAttachment;
+    m_verifyMissingAttachment = 0;
+  }
 }
 
 void KMComposeWin::slotVerifyMissingAttachmentTimeout()