diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 51c2ccc80f5..c6b0fa00e3c 100755
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -255,7 +255,19 @@ class Maildir(Mailbox):
             suffix = ''
         uniq = os.path.basename(tmp_file.name).split(self.colon)[0]
         dest = os.path.join(self._path, subdir, uniq + suffix)
-        os.rename(tmp_file.name, dest)
+        try:
+            if hasattr(os, 'link'):
+                os.link(tmp_file.name, dest)
+                os.remove(tmp_file.name)
+            else:
+                os.rename(tmp_file.name, dest)
+        except OSError, e:
+            os.remove(tmp_file.name)
+            if e.errno == errno.EEXIST:
+                raise ExternalClashError('Name clash with existing message: %s'
+                                         % dest)
+            else:
+                raise
         if isinstance(message, MaildirMessage):
             os.utime(dest, (os.path.getatime(dest), message.get_date()))
         return uniq
@@ -431,12 +443,17 @@ class Maildir(Mailbox):
         except OSError, e:
             if e.errno == errno.ENOENT:
                 Maildir._count += 1
-                return open(path, 'wb+')
+                try:
+                    return _create_carefully(path)
+                except OSError, e:
+                    if e.errno != errno.EEXIST:
+                        raise
             else:
                 raise
-        else:
-            raise ExternalClashError('Name clash prevented file creation: %s' %
-                                     path)
+
+        # Fall through to here if stat succeeded or open raised EEXIST.
+        raise ExternalClashError('Name clash prevented file creation: %s' %
+                                 path)
 
     def _refresh(self):
         """Update table of contents mapping."""
diff --git a/Misc/NEWS b/Misc/NEWS
index 3aa5ff32ef0..354a7b0bc1d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -100,6 +100,10 @@ Library
   weren't passing the message factory on to newly created Maildir/MH
   objects.
 
+- Patch #1514543: In the Maildir clash, report errors if there's 
+  a name clash instead of possibly losing a message.  (Patch by David
+  Watson.)
+
 - Patch #1514544: Try to ensure that messages/indexes have been physically
   written to disk after calling .flush() or .close(). (Patch by David
   Watson.)