diff -ru2N mutt-1.5.21/debian/rules mutt-MCC/debian/rules
--- mutt-1.5.21/debian/rules	2011-07-27 11:47:59.000000000 +0100
+++ mutt-MCC/debian/rules	2011-07-27 11:41:32.000000000 +0100
@@ -55,5 +55,5 @@
 		--enable-compressed		\
 		--enable-debug			\
-		--enable-fcntl			\
+		--disable-fcntl --disable-flock \
 		--enable-hcache			\
 		$(GPGME)			\
diff -ru2N mutt-1.5.21/dotlock.c mutt-MCC/dotlock.c
--- mutt-1.5.21/dotlock.c	2009-01-05 19:20:53.000000000 +0000
+++ mutt-MCC/dotlock.c	2011-07-27 11:43:46.000000000 +0100
@@ -469,13 +469,10 @@
     return -1;
 
-  if (_fd != -1)
-    fd = _fd;
-  else if ((fd = open (basename, O_RDONLY)) == -1)
+  if ((fd = open (basename, O_RDONLY)) == -1)
     return -1;
   
   r = fstat (fd, &fsb);
   
-  if (_fd == -1)
-    close (fd);
+  close (fd);
   
   if (r == -1)
diff -ru2N mutt-1.5.21/init.c mutt-MCC/init.c
--- mutt-1.5.21/init.c	2010-08-25 17:31:40.000000000 +0100
+++ mutt-MCC/init.c	2011-07-27 11:45:25.000000000 +0100
@@ -2973,6 +2973,6 @@
   else
   {
-#ifdef HOMESPOOL
-    mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof (buffer));
+#if 1
+    snprintf (buffer, sizeof (buffer), "%s/.Mail/%s", NONULL(Homedir), NONULL(Username));
 #else
     mutt_concat_path (buffer, MAILPATH, NONULL(Username), sizeof (buffer));
diff -ru2N mutt-1.5.21/main.c mutt-MCC/main.c
--- mutt-1.5.21/main.c	2010-09-13 18:19:55.000000000 +0100
+++ mutt-MCC/main.c	2011-07-27 11:46:27.000000000 +0100
@@ -530,5 +530,5 @@
   char *includeFile = NULL;
   char *draftFile = NULL;
-  char *newMagic = NULL;
+  char *newMagic = "mmdf";
   HEADER *msg = NULL;
   LIST *attach = NULL;
diff -ru2N mutt-1.5.21/mutt_dotlock.c mutt-MCC/mutt_dotlock.c
--- mutt-1.5.21/mutt_dotlock.c	2009-11-10 20:25:27.000000000 +0000
+++ mutt-MCC/mutt_dotlock.c	2011-07-27 11:47:24.000000000 +0100
@@ -469,13 +469,10 @@
     return -1;
 
-  if (_fd != -1)
-    fd = _fd;
-  else if ((fd = open (basename, O_RDONLY)) == -1)
+  if ((fd = open (basename, O_RDONLY)) == -1)
     return -1;
   
   r = fstat (fd, &fsb);
   
-  if (_fd == -1)
-    close (fd);
+  close (fd);
   
   if (r == -1)