Index: src/java/org/apache/james/postage/execution/SampleController.java
===================================================================
--- src/java/org/apache/james/postage/execution/SampleController.java	(revision 732)
+++ src/java/org/apache/james/postage/execution/SampleController.java	(revision 733)
@@ -42,6 +42,10 @@
     }
 
     public void runThreaded() {
+        if (m_sendPerMinute < 1) {
+            log.warn("sample controller effectivly disabled with send-per-minute value = " + m_sendPerMinute);
+            return;
+        }
         m_timer = new Timer(true);
         m_timer.schedule(this, 5, 60*1000/m_sendPerMinute);
     }
Index: src/java/org/apache/james/postage/PostageRunner.java
===================================================================
--- src/java/org/apache/james/postage/PostageRunner.java	(revision 732)
+++ src/java/org/apache/james/postage/PostageRunner.java	(revision 733)
@@ -299,6 +299,10 @@
             Iterator mailSenderIterator = sendProfile.mailSenderIterator();
             while (mailSenderIterator.hasNext()) {
                 MailSender mailSender = (MailSender)mailSenderIterator.next();
+                int sendPerMinute = mailSender.getSendPerMinute();
+                
+                if (sendPerMinute < 1) continue;
+                
                 SMTPClient smtpClient = new SMTPClient(m_postageConfiguration.getTestserverHost(),
                         m_postageConfiguration.getTestserverPortSMTPInbound(),
                         m_postageConfiguration.getInternalUsers(),
@@ -311,7 +315,7 @@
                 log.info("availability of inbound mailing " + (available ? "": "NOT ") + "verified");
                 if (!available) continue;
 
-                SampleController sendController = new SampleController(smtpClient, mailSender.getSendPerMinute());
+                SampleController sendController = new SampleController(smtpClient, sendPerMinute);
                 m_sendControllers.add(sendController);
             }
         }
Index: src/java/org/apache/james/postage/result/MailProcessingRecord.java
===================================================================
--- src/java/org/apache/james/postage/result/MailProcessingRecord.java	(revision 732)
+++ src/java/org/apache/james/postage/result/MailProcessingRecord.java	(revision 733)
@@ -281,6 +281,8 @@
         stringBuffer.append(timeSendEnd).append(SEPARATOR);
         stringBuffer.append(byteSendText).append(SEPARATOR);
         stringBuffer.append(byteSendBinary).append(SEPARATOR);
+        stringBuffer.append(byteReceivedText).append(SEPARATOR);
+        stringBuffer.append(byteReceivedBinary).append(SEPARATOR);
         stringBuffer.append(byteReceivedTotal).append(SEPARATOR);
         stringBuffer.append(errorNumberSending).append(SEPARATOR);
         stringBuffer.append(errorTextSending).append(SEPARATOR);
Index: src/java/org/apache/james/postage/client/SMTPClient.java
===================================================================
--- src/java/org/apache/james/postage/client/SMTPClient.java	(revision 732)
+++ src/java/org/apache/james/postage/client/SMTPClient.java	(revision 733)
@@ -29,14 +29,13 @@
 import org.columba.ristretto.composer.MimeTreeRenderer;
 import org.columba.ristretto.io.ByteBufferSource;
 import org.columba.ristretto.io.CharSequenceSource;
-import org.columba.ristretto.io.StreamUtils;
 import org.columba.ristretto.message.Address;
 import org.columba.ristretto.message.Header;
 import org.columba.ristretto.message.LocalMimePart;
 import org.columba.ristretto.message.MimeHeader;
 import org.columba.ristretto.message.MimePart;
+import org.columba.ristretto.message.MimeTree;
 import org.columba.ristretto.message.MimeType;
-import org.columba.ristretto.message.MimeTree;
 import org.columba.ristretto.smtp.SMTPException;
 import org.columba.ristretto.smtp.SMTPProtocol;
 
@@ -151,10 +150,11 @@
     private static LocalMimePart createMail(MailSender mailSender, MailProcessingRecord mailProcessingRecord) {
         MimeHeader mimeHeader = new MimeHeader(new Header());
         mimeHeader.set("Mime-Version", "1.0");
-        mimeHeader.set("Content-Type", "multipart/alternative");
         mimeHeader.set("X-James-Postage", "This is a test mail sent by James Postage");
         mimeHeader.set("Subject", mailSender.getSubject());
+        mimeHeader.set("Message-ID", "Postage-" + System.currentTimeMillis());
         mailProcessingRecord.setSubject(mailSender.getSubject());
+        mimeHeader.set("Content-Type", "multipart/mixed");
 
         if (mailProcessingRecord.getMailId() != null) mimeHeader.set(MAIL_ID_HEADER, mailProcessingRecord.getMailId());
         LocalMimePart mail = new LocalMimePart(mimeHeader);