diff --git a/TODO.md b/TODO.md
index d1dda23..198e8de 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,9 +1,16 @@
 #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. tests!
+2. docker support
+3. multi domain
+4. [pop] auto delete
+5. [pop] TOP command
+6. merge with cloud_test branch
+
+7. User timeout for POP
+8. unittests
+9. Web interface
+10. Custom email processing
+11. Refactor smtp controller
+12. pip installable package
+13. Listen on port 465 for smtp too