diff --git a/ChangeLog b/ChangeLog
index 042404f28..a680134a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+1998-03-31  Stefan Taferner  <taferner@kde.org> (KMail-0.6.5)
+
+	* Folders: fixed bug introduced on 1998-03-26: open failed on
+	folders where lock() returned an error.
+
 1998-03-28  Stefan Taferner  <taferner@kde.org>
 
+	* Headers: when opening a folder the contents was not automatically
+	sorted, now is.
+
 	* Pop: new messages retrieved from pop accounts were not
 	marked new. Now fixed.
 
diff --git a/kmfolder.cpp b/kmfolder.cpp
index e88d6eca7..0b5a17883 100644
--- a/kmfolder.cpp
+++ b/kmfolder.cpp
@@ -157,7 +157,7 @@ int KMFolder::open(void)
     rc = createIndexFromContents();
   }
 
-  if (!rc) rc = lock();
+  if (!rc) lock();
   mQuiet = 0;
 
   return rc;
diff --git a/kmheaders.cpp b/kmheaders.cpp
index e3630c64a..6906e6586 100644
--- a/kmheaders.cpp
+++ b/kmheaders.cpp
@@ -143,8 +143,8 @@ void KMHeaders::setFolder (KMFolder *aFolder)
 	    this, SLOT(msgChanged()));
     connect(mFolder, SIGNAL(statusMsg(const char*)),
 	    mOwner, SLOT(statusMsg(const char*)));
-    readFolderConfig();
     mFolder->open();
+    readFolderConfig();
   }
 
   updateMessageList();
diff --git a/kmversion.h b/kmversion.h
index 51dfa0254..f26616a82 100644
--- a/kmversion.h
+++ b/kmversion.h
@@ -3,6 +3,6 @@
 #ifndef kmversion_h
 #define kmversion_h
 
-#define KMAIL_VERSION "0.6.4"
+#define KMAIL_VERSION "0.6.5"
 
 #endif /*kmversion_h*/