--- a/TODO.txt	Thu Mar 25 22:52:12 2004 +0000
+++ b/TODO.txt	Thu Mar 25 22:53:26 2004 +0000
@@ -1,5 +1,4 @@
-This file has been re-purposed to contain specifically the items that need
-doing before the next release:
+This file contains items that need doing before the next release:
 
 - ensure index creation is triggered by the version 1->2 update
   (and other upgrade tests)

--- a/roundup/mailer.py	Thu Mar 25 22:52:12 2004 +0000
+++ b/roundup/mailer.py	Thu Mar 25 22:53:26 2004 +0000
@@ -1,7 +1,7 @@
 """Sending Roundup-specific mail over SMTP.
 """
 __docformat__ = 'restructuredtext'
-# $Id: mailer.py,v 1.8 2004-03-25 22:52:12 richard Exp $
+# $Id: mailer.py,v 1.9 2004-03-25 22:53:26 richard Exp $
 
 import time, quopri, os, socket, smtplib, re
 
@@ -99,8 +99,6 @@
         - subject: the subject as a string.
 
         """
-        message, writer = self.get_standard_message(to, subject)
-
         # see whether we should send to the dispatcher or not
         dispatcher_email = getattr(self.config, "DISPATCHER_EMAIL",
             getattr(self.config, "ADMIN_EMAIL"))
@@ -110,6 +108,8 @@
         elif error_messages_to == "both":
             to.append(dispatcher_email)
 
+        message, writer = self.get_standard_message(to, subject)
+
         part = writer.startmultipartbody('mixed')
         part = writer.nextpart()
         part.addheader('Content-Transfer-Encoding', 'quoted-printable')