diff --git a/ChangeLog b/ChangeLog
index 716b19fcc..9b622e1ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 03 12:30:00 2003  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSNotificationCenter.m: Use locking at all times until
+	problems with GNUMail threading and notifications are analysed/fixed.
+
 Mon Nov 03 08:35:00 2003  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSString.m: Remove unnecessary -copy implementations for
diff --git a/Source/NSNotificationCenter.m b/Source/NSNotificationCenter.m
index a9896cd2f..759389372 100644
--- a/Source/NSNotificationCenter.m
+++ b/Source/NSNotificationCenter.m
@@ -411,6 +411,8 @@ static NCTable *newNCTable(void)
   t->array = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GSIArray_t));
   GSIArrayInitWithZoneAndCapacity(t->array, NSDefaultMallocZone(), 16);
 
+  // t->_lock = [GSLazyRecursiveLock new];
+  t->_lock = [NSRecursiveLock new];
   return t;
 }
 
@@ -588,7 +590,6 @@ static NSNotificationCenter *default_center = nil;
   if ((self = [super init]) != nil)
     {
       TABLE = newNCTable();
-      TABLE->_lock = [GSLazyRecursiveLock new];
     }
   return self;
 }