diff --git a/TODO b/TODO
index c260537..798c1b8 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,21 @@
+Fixes:
+- EmailListActivity.onActivityResult() not called after I2P Android starts
 - Fix B64 encoding of Bitmaps
-- "Empty trash" option in Trash folder
 - Figure out how to highlight email backgrounds when selected in list
 - Refine view email page
-- Show contact pictures in recipients dropdown
-- Add optional CC: and BCC: fields
+-- Delete/read/unread/move actions that don't break everything
+- Improve network status page
+-- Show full network error? Make it copy-able?
 
+Tasks:
 - Refactor code
 -- Reorganize for clarity
 -- Optimize use of Android lifecycles
+
+Features:
+- Import/export identities
+-- Export Destination / make it copyable
+- Reply button
+- Show contact pictures in recipients dropdown
+- Add optional CC: and BCC: fields
+- "Empty trash" option in Trash folder