diff --git a/ChangeLog b/ChangeLog
index ab98d0d8e..042404f28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1998-03-28  Stefan Taferner  <taferner@kde.org>
+
+	* Pop: new messages retrieved from pop accounts were not
+	marked new. Now fixed.
+
+1998-03-26  Stefan Taferner  <taferner@kde.org>
+
+	* Folders: when opening and locking a folder there were
+	cases (in fact most of the time) when the folder seemed
+	to be not locked but was. Now this is handled better.
+
 1998-03-24  Stefan Taferner  <taferner@kde.org>  (KMail-0.6.4)
 
 	* Message: decoding of quoted-printable RFC1522 strings
diff --git a/kmfolder.cpp b/kmfolder.cpp
index 6f12ab0b0..e88d6eca7 100644
--- a/kmfolder.cpp
+++ b/kmfolder.cpp
@@ -126,6 +126,7 @@ int KMFolder::open(void)
 
   assert(name() != NULL);
 
+  mFilesLocked = FALSE;
   mStream = fopen(location(), "r+"); // messages file
   if (!mStream) 
   {
@@ -156,7 +157,7 @@ int KMFolder::open(void)
     rc = createIndexFromContents();
   }
 
-  if (!rc) lock();
+  if (!rc) rc = lock();
   mQuiet = 0;
 
   return rc;
@@ -250,7 +251,6 @@ int KMFolder::lock(void)
     return errno;
   }
 
-// JACEK: was (!mIndexStream) - nonsense which crashed fileno
   if (mIndexStream)
   {
 #if HAVE_FLOCK
diff --git a/kmmsgbase.cpp b/kmmsgbase.cpp
index 4b8e23bac..bea98be59 100644
--- a/kmmsgbase.cpp
+++ b/kmmsgbase.cpp
@@ -27,7 +27,7 @@ KMMsgBase::KMMsgBase(KMFolder* aParent)
   mDirty   = FALSE;
   mMsgSize = 0;
   mFolderOffset = 0;
-  mStatus  = KMMsgStatusUnknown;
+  mStatus  = KMMsgStatusNew;
   mDate    = 0;
 }