diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..1c4a5a7
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,10 @@
+## Changes
+
+#### Version 0.8.4
+
+  * calendar view as separate gem
+  * adding bluecloth for rendering markdown text
+
+#### Version 0.8.3
+
+  * export, imports of contact
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..1ef14db
--- /dev/null
+++ b/TODO
@@ -0,0 +1,21 @@
+## Todo
+
+app/controllers/folders_controller.rb:
+
+  * [ 30] [TODO] recreate local copy of folders
+  * [ 99] [TODO] save system folders
+
+app/controllers/messages_controller.rb:
+
+  * [101] [FIXME] missing fields and support arrays
+
+app/controllers/messages_ops_controller.rb:
+
+  * [128] [FIXME] check if uploads directory exists
+  * [176] [FIXME] check if domain is set
+  * [192] [TODO] check if email address is valid if not get address from contacts
+  * [259] [FIXME] edit does not support attachments
+
+app/models/prefs.rb:
+
+  * [ 19] [TODO] move refresh to prefs and make refresh page with messages