--- a/src.lock_maildirsize	Tue May 17 16:14:22 2011 +0200
+++ b/src.lock_maildirsize	Tue May 17 16:19:46 2011 +0200
@@ -1,9 +1,9 @@
 # HG changeset patch
-# Parent 725ab374f90553e848d1c418c11003dab45ec07c
+# Parent 713d8d0301931a88aad6f7dec3adb838ac15f51f
 
-diff -r 725ab374f905 src/transports/appendfile.c
---- a/src/transports/appendfile.c	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/appendfile.c	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/appendfile.c	Tue May 17 16:17:21 2011 +0200
 @@ -13,6 +13,7 @@
  
  #ifdef SUPPORT_MAILDIR
@@ -71,7 +71,7 @@
  #ifdef SUPPORT_MBX
  /*************************************************
  *         Copy message into MBX mailbox          *
-@@ -2433,18 +2457,19 @@
+@@ -2433,15 +2457,15 @@
        {
        off_t size;
        int filecount;
@@ -89,12 +89,8 @@
 +        addr->message = excuse;
          return FALSE;
          }
- 
-+
-       if (mailbox_size < 0) mailbox_size = size;
-       if (mailbox_filecount < 0) mailbox_filecount = filecount;
-       }
-@@ -3154,6 +3179,12 @@
+       /* can also return -2, which means that the file was removed because of
+@@ -3171,6 +3195,12 @@
        uschar *renamename = newname;
        fd = -1;
  
@@ -107,7 +103,7 @@
        DEBUG(D_transport) debug_printf("renaming temporary file\n");
  
        /* If there is no rename name set, we are in a non-maildir, non-mailstore
-@@ -3274,6 +3305,7 @@
+@@ -3291,6 +3321,7 @@
            filename = dataname = NULL;   /* Prevents attempt to unlink at end */
            }
          }        /* maildir or mailstore */
@@ -115,7 +111,7 @@
        }          /* successful write + close */
      }            /* isdirectory */
    }              /* write success */
-@@ -3309,6 +3341,11 @@
+@@ -3326,6 +3357,11 @@
  detected, in order to get the file closed and the lock file tidied away. */
  
  RETURN:
@@ -127,9 +123,9 @@
  
  #ifdef SUPPORT_MBX
  if (mbx_lockfd >= 0)
-diff -r 725ab374f905 src/transports/appendfile.h
---- a/src/transports/appendfile.h	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/appendfile.h	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/appendfile.h	Tue May 17 16:17:21 2011 +0200
 @@ -97,5 +97,8 @@
  /* Function that is shared with tf_maildir.c */
  
@@ -139,9 +135,9 @@
 +
  
  /* End of transports/appendfile.h */
-diff -r 725ab374f905 src/transports/tf_maildir.c
---- a/src/transports/tf_maildir.c	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/tf_maildir.c	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/tf_maildir.c
+--- a/src/transports/tf_maildir.c	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/tf_maildir.c	Tue May 17 16:17:21 2011 +0200
 @@ -367,13 +367,16 @@
  
  Returns:           >=0  a file descriptor for an open maildirsize file
@@ -248,9 +244,9 @@
  DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT
    " filecount=%d\n", size, filecount);
  *returned_size = size;
-diff -r 725ab374f905 src/transports/tf_maildir.h
---- a/src/transports/tf_maildir.h	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/tf_maildir.h	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/tf_maildir.h
+--- a/src/transports/tf_maildir.h	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/tf_maildir.h	Tue May 17 16:17:21 2011 +0200
 @@ -16,7 +16,7 @@
                  uschar *);
  extern int    maildir_ensure_sizefile(uschar *,