diff --git a/INSTALL b/INSTALL
index be84b958b..f890d52dd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,6 +7,7 @@ Requirements
 - Python version 2.6+
 - Django version 1.2+ (http://docs.djangoproject.com/en/dev/intro/install/#intro-install)
 - south version 0.7+ (http://south.aeracode.org/)
+- ckeditor version 3.4.1+ (http://ckeditor.com/)
 
 How to install
 --------------
@@ -46,6 +47,20 @@ First, decompress the new tarball at the same location than your
 current installation. Then, check if the new version you're installing
 requires a migration::
 
+0.8.1 -> 0.8.2 : ckeditor integration.
+
+ * Download the latest release of ckeditor and extract it into
+   <modoboa_dir>/static/js/. It should create a new folder named
+   'ckeditor'.
+
+ * Update your config file. First, update the following variables::
+   
+   MEDIA_ROOT = os.path.join(MODOBOA_DIR, '/static')
+   MEDIA_URL = '/static/'
+
+ * Then, delete the following variables: STATIC_ROOTDIR and
+   TEMPLATE_CONTEXT_PROCESSORS.
+
 0.8 -> 0.8.1 : project renamed.
 
  * First, rename your mailng folder to modoboa and copy all the
diff --git a/extensions/amavis_quarantine/templates/getmailcontent.html b/extensions/amavis_quarantine/templates/amavis_quarantine/getmailcontent.html
similarity index 100%
rename from extensions/amavis_quarantine/templates/getmailcontent.html
rename to extensions/amavis_quarantine/templates/amavis_quarantine/getmailcontent.html
diff --git a/extensions/amavis_quarantine/templates/index.html b/extensions/amavis_quarantine/templates/amavis_quarantine/index.html
similarity index 100%
rename from extensions/amavis_quarantine/templates/index.html
rename to extensions/amavis_quarantine/templates/amavis_quarantine/index.html
diff --git a/extensions/amavis_quarantine/templates/viewheader.html b/extensions/amavis_quarantine/templates/amavis_quarantine/viewheader.html
similarity index 100%
rename from extensions/amavis_quarantine/templates/viewheader.html
rename to extensions/amavis_quarantine/templates/amavis_quarantine/viewheader.html
diff --git a/extensions/amavis_quarantine/templates/viewmail.html b/extensions/amavis_quarantine/templates/amavis_quarantine/viewmail.html
similarity index 100%
rename from extensions/amavis_quarantine/templates/viewmail.html
rename to extensions/amavis_quarantine/templates/amavis_quarantine/viewmail.html
diff --git a/extensions/postfix_autoreply/templates/autoreply.html b/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
similarity index 100%
rename from extensions/postfix_autoreply/templates/autoreply.html
rename to extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
diff --git a/extensions/postfix_autoreply/views.py b/extensions/postfix_autoreply/views.py
index a89d9ce56..0a176e509 100644
--- a/extensions/postfix_autoreply/views.py
+++ b/extensions/postfix_autoreply/views.py
@@ -43,7 +43,8 @@ def autoreply(request):
                             mimetype="application/json")
 
     form = ARmessageForm(instance=arm)
-    form.fields['untildate'].initial = arm.untildate
+    if arm is not None:
+        form.fields['untildate'].initial = arm.untildate
     return _render(request, "postfix_autoreply/autoreply.html", {
             "form" : form
             })
diff --git a/extensions/stats/templates/adminindex.html b/extensions/stats/templates/stats/adminindex.html
similarity index 100%
rename from extensions/stats/templates/adminindex.html
rename to extensions/stats/templates/stats/adminindex.html
diff --git a/extensions/stats/templates/content.html b/extensions/stats/templates/stats/content.html
similarity index 100%
rename from extensions/stats/templates/content.html
rename to extensions/stats/templates/stats/content.html
diff --git a/extensions/stats/templates/graphs.html b/extensions/stats/templates/stats/graphs.html
similarity index 100%
rename from extensions/stats/templates/graphs.html
rename to extensions/stats/templates/stats/graphs.html
diff --git a/extensions/stats/templates/index.html b/extensions/stats/templates/stats/index.html
similarity index 100%
rename from extensions/stats/templates/index.html
rename to extensions/stats/templates/stats/index.html
diff --git a/extensions/webmail/templates/compose.html b/extensions/webmail/templates/webmail/compose.html
similarity index 100%
rename from extensions/webmail/templates/compose.html
rename to extensions/webmail/templates/webmail/compose.html
diff --git a/extensions/webmail/templates/folders.html b/extensions/webmail/templates/webmail/folders.html
similarity index 100%
rename from extensions/webmail/templates/folders.html
rename to extensions/webmail/templates/webmail/folders.html
diff --git a/extensions/webmail/templates/headers.html b/extensions/webmail/templates/webmail/headers.html
similarity index 100%
rename from extensions/webmail/templates/headers.html
rename to extensions/webmail/templates/webmail/headers.html
diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/webmail/index.html
similarity index 100%
rename from extensions/webmail/templates/index.html
rename to extensions/webmail/templates/webmail/index.html
diff --git a/scripts/extension.py b/scripts/extension.py
index 849b2af37..b07ff905a 100755
--- a/scripts/extension.py
+++ b/scripts/extension.py
@@ -9,7 +9,7 @@ def usage():
     sys.exit(1)
 
 def update_extension(name, extdir, state):
-    for d in ['templates', 'scripts']:
+    for d in ['scripts']:
         if not os.path.isdir("%s/%s" % (extdir, d)):
 	    continue
         cmd = state == "on" \