diff --git a/TODO.md b/TODO.md
index d1dda23..0ff80b8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,9 +1,13 @@
 #TODO
 
-1. User timeout for POP
 1. unittests
 1. Web interface
 1. Custom email processing
 1. Refactor smtp controller
 1. pip installable package
-1. Listen on port 465 for smtp too
+1. Improve logging with timestamp, peer info, stats
+1. custom smtp with auth
+  1. Filter domain name
+  2. Support multiple subdomains and save in different folders
+1. smtp2go integration
+1. metrics