--- Handlers/Scrubber.py 2006-01-28 21:22:03.000000000 -0800 +++ Handlers/Scrubber.py 2006-01-30 17:58:31.890625000 -0800 @@ -124,10 +124,11 @@ # archives/private//attachments/YYYYMMDD// # Start by calculating the date-based and msgid-hash components. fmt = '%Y%m%d' + now = None datestr = msg.get('Date') if datestr: now = parsedate(datestr) - else: + if not now: now = time.gmtime(msgdata.get('received_time', time.time())) datedir = safe_strftime(fmt, now) if not datedir: