diff --git a/ChangeLog b/ChangeLog
index 7f8595c43..dda896e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailObject+Draft.m: add a default
+	attachment path of "1" when path is nil and thus unique.
+
 	* UI/SOGoUI/UIxComponent.m (-_parseQueryString:): fixed handling
 	of bad charsets in the parameters encoding. Invalid values will be
 	discarded.
diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m
index b527e092d..b78f62749 100644
--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@@ -276,7 +276,11 @@
 	}
     }
   else
-    [self _fetchFileAttachmentKey: part intoArray: keys withPath: path];
+    {
+      if (!path)
+        path = @"1";
+      [self _fetchFileAttachmentKey: part intoArray: keys withPath: path];
+    }
 }
 
 #warning we might need to handle parts with a "name" attribute