--- mga-gnome/trunk/mga-gnome	2012/03/18 11:08:07	3555
+++ mga-gnome/trunk/mga-gnome	2012/03/18 11:40:22	3556
@@ -704,7 +704,14 @@
         # maildrop aborts and will try to deliver after 5min
         # fork to avoid this
         if os.fork() != 0: sys.exit(0)
-        time.sleep(SLEEP_INITIAL)
+        # wait SLEEP_INITIAL after the message was sent
+        secs = SLEEP_INITIAL
+        t = email.utils.parsedate_tz(msg['Date'])
+        if t is not None:
+            msg_time = email.utils.mktime_tz(t)
+            secs = SLEEP_INITIAL - (time.time() - msg_time)
+
+        if secs > 0: time.sleep(secs)
 
     error = False
     for package in packages: