diff --git a/ChangeLog b/ChangeLog
index 9591f937b..2e2565e93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -attachmentNames]):
+	initialize "attachmentNames" if it was NOT initialized... I think
+	this was a typo.
+
 	* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
 	-fetchMailForForwarding:sourceMail]): append the signature to
 	mails forwarded as attachment.
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index c9c41dc2c..fd45643ca 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -396,11 +396,11 @@ static NSArray *infoKeys = nil;
 {
   NSArray *a;
 
-  if (attachmentNames)
+  if (!attachmentNames)
     {
       a = [[self clientObject] fetchAttachmentNames];
-      a = [a sortedArrayUsingSelector: @selector (compare:)];
-      attachmentNames = [a copy];
+      ASSIGN (attachmentNames,
+	      [a sortedArrayUsingSelector: @selector (compare:)]);
     }
 
   return attachmentNames;
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 4609c7b9c..abda2830b 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -23,15 +23,15 @@
   </div>
 
   <form const:href="send" name="pageform" enctype="multipart/form-data">
-      <div id="attachmentsArea">
-	<var:string label:value="Attachments:" />
-	<ul id="attachments">
-	  <var:foreach list="attachmentNames" item="attachmentName"
-	    ><li><img rsrc:src="attachment.gif"
-		/><var:string value="attachmentName"
-		/></li></var:foreach>
-	</ul>
-      </div>
+    <div id="attachmentsArea">
+      <var:string label:value="Attachments:" />
+      <ul id="attachments">
+	<var:foreach list="attachmentNames" item="attachmentName"
+	  ><li><img rsrc:src="attachment.gif"
+	      /><var:string value="attachmentName"
+	      /></li></var:foreach>
+      </ul>
+    </div>
     <div id="headerArea">
       <span class="headerField"><var:string label:value="From" />:</span>
       <var:popup const:name="from"
@@ -47,12 +47,12 @@
 	><span class="headerField"><var:string label:value="Subject"
 	    />:</span
 	  >
-	  <input name="subject"
-	    type="text"
-	    class="textField"
-	    var:value="subject"
-	    /></div>
-    <!-- separator line --><hr/>
+	<input name="subject"
+	  type="text"
+	  class="textField"
+	  var:value="subject"
+	  /></div>
+      <!-- separator line --><hr/>
     </div>
     <textarea id="text" name="text" rows="30" var:value="text"/>
     <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->