diff --git a/CHANGELOG b/CHANGELOG
index b589a4c..2d8d885 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@ Version 0.2.0   - 3 April 2002
   * Clamped down with lots of assert()s checking function parameters
   * Complain earlier if we do not have permission to write to the output
     directory
+  * Use the 'Date' field of a message when constructing the 'From_' line
+    from a maildir/MH mailbox if there is no 'Delivery-Date' field.
 
 Version 0.1.0   - 31 March 2002
   * Initial release
diff --git a/TODO b/TODO
index 73d3af3..fefe4a0 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,9 @@ Goals for next minor release (0.2.1):
 * Test exclusive locking works with another test process
 * Perserve atime of original mailbox properly
 * Finish man page
+* Change archivemail so that if a message has no valid 'Date' or
+  'Delivery-Date' header, don't get upset -- try to make do. 
+  (Esp. if we are using a maildir or MH folder -- use the file timestamp)
 
 Goals for next major release (0.3.0):
 -------------------------------------