diff --git a/html/configure.thunderbird.html b/html/configure.thunderbird.html
index ddf509c4..68db3978 100644
--- a/html/configure.thunderbird.html
+++ b/html/configure.thunderbird.html
@@ -27,24 +27,24 @@
 <h2 id="create-new-mail-account">Create new mail account</h2>
 <p>To create a new mail account with Thunderbird, please click menu: <code>File -&gt; New -&gt; Mail Account</code>.</p>
 <p>Add your name, email address and password in this screen.</p>
-<p><img alt="" src="./images/thunderbird.new.mail.account.png" title="Thunderbird.new.mail.account.png" /></p>
+<p><img alt="" src="./images/thunderbird/new.mail.account.png" /></p>
 <p>Click continue, it will detect IMAP and SMTP server automatically.</p>
 <p>Note:</p>
 <ul>
 <li>Login username must be full email address. You may want to click <code>Edit</code> to ensure it is correct.</li>
 <li>If you want to use POP3 instead of IMAP, click "Edit" and change it to POP3 in this screen with port <code>110</code>, <code>STARTTLS</code>.</li>
 </ul>
-<p><img alt="" src="./images/thunderbird.new.mail.account.setup.png" title="Thunderbird.new.mail.account.setup.png" /></p>
+<p><img alt="" src="./images/thunderbird/new.mail.account.setup.png" /></p>
 <h2 id="configure-thunderbird-as-pop3-client">Configure Thunderbird as POP3 client</h2>
 <p>Warning: Make sure you are using full email address as username.</p>
-<p><img alt="" src="./images/thunderbird.pop3.png" title="Thunderbird.pop3.png" /></p>
+<p><img alt="" src="./images/thunderbird/pop3.png" /></p>
 <h2 id="configure-thunderbird-as-imap-client">Configure Thunderbird as IMAP client</h2>
 <p>Warning: Make sure you are using full email address as username.</p>
-<p><img alt="" src="./images/thunderbird.imap.png" title="Thunderbird.imap.png" /></p>
+<p><img alt="" src="./images/thunderbird/imap.png" /></p>
 <h2 id="configure-thunderbird-to-send-mail-via-smtp">Configure Thunderbird to send mail via SMTP</h2>
 <p>Menu: Tools -&gt; Account settings... -&gt; Outgoing server (SMTP) -&gt; Choose the server you are using.</p>
 <p>Warning: Make sure you are using full email address as username.</p>
-<p><img alt="" src="./images/thunderbird.smtp.png" title="Thunderbird.smtp.png" /></p>
+<p><img alt="" src="./images/thunderbird/smtp.png" /></p>
 <h2 id="use-openldap-as-global-ldap-address-book">Use OpenLDAP as Global LDAP Address Book</h2>
 <p><strong>IMPORTANT NOTE</strong>: Thunderbird won\'t show contacts in LDAP address book directly, but it works when you starting typing email address in recipient field while composing email.</p>
 <p>Here we take Thunderbird 5.0 for example. Steps:</p>
diff --git a/html/images/Thunderbird.imap.png b/html/images/thunderbird/imap.png
similarity index 100%
rename from html/images/Thunderbird.imap.png
rename to html/images/thunderbird/imap.png
diff --git a/html/images/Thunderbird.new.mail.account.png b/html/images/thunderbird/new.mail.account.png
similarity index 100%
rename from html/images/Thunderbird.new.mail.account.png
rename to html/images/thunderbird/new.mail.account.png
diff --git a/html/images/Thunderbird.new.mail.account.setup.png b/html/images/thunderbird/new.mail.account.setup.png
similarity index 100%
rename from html/images/Thunderbird.new.mail.account.setup.png
rename to html/images/thunderbird/new.mail.account.setup.png
diff --git a/html/images/Thunderbird.pop3.png b/html/images/thunderbird/pop3.png
similarity index 100%
rename from html/images/Thunderbird.pop3.png
rename to html/images/thunderbird/pop3.png
diff --git a/html/images/Thunderbird.smtp.png b/html/images/thunderbird/smtp.png
similarity index 100%
rename from html/images/Thunderbird.smtp.png
rename to html/images/thunderbird/smtp.png
diff --git a/html/sogo-centos-6-mysql.html b/html/sogo-centos-6-mysql.html
index 716f693d..3c0630e5 100644
--- a/html/sogo-centos-6-mysql.html
+++ b/html/sogo-centos-6-mysql.html
@@ -18,15 +18,17 @@
 <li><a href="#install-sogo">Install SOGo</a></li>
 <li><a href="#create-required-sql-database">Create required SQL database</a></li>
 <li><a href="#configure-sogo">Configure SOGo</a></li>
-<li><a href="#enable-activesync-support">Enable ActiveSync support</a><ul>
+<li><a href="#configure-web-server">Configure web server</a><ul>
 <li><a href="#apache-web-server">Apache web server</a></li>
 <li><a href="#nginx-web-server">Nginx web server</a></li>
 </ul>
 </li>
 <li><a href="#start-sogo-and-dependent-services">Start SOGo and dependent services</a></li>
+<li><a href="#add-dovecot-master-user-used-for-vacation-message-expiration">Add Dovecot Master User, used for vacation message expiration</a></li>
+<li><a href="#add-required-cron-jobs">Add required cron jobs</a></li>
 <li><a href="#access-sogo-from-web-browser">Access SOGo from web browser</a></li>
 <li><a href="#configure-your-mail-clients-or-mobile-devices-to-use-caldavcarddav-services">Configure your mail clients or mobile devices to use CalDav/CardDAV services</a></li>
-<li><a href="#references">References</a></li>
+<li><a href="#todo">TODO</a></li>
 </ul>
 </li>
 </ul>
@@ -201,7 +203,9 @@ for you, just replace MySQL username/password in this file, then it's done.</p>
 }
 </code></pre>
 
-<h2 id="enable-activesync-support">Enable ActiveSync support</h2>
+<h2 id="configure-web-server">Configure web server</h2>
+<p>To access SOGo groupware (webmail/calendar/contact), we need to configure
+web server.</p>
 <h3 id="apache-web-server">Apache web server</h3>
 <p>SOGo installs config file <code>/etc/httpd/conf.d/SOGo.conf</code> by default, please
 open it and find below lines:</p>
@@ -277,9 +281,26 @@ the real directory which contains SOGo files:</p>
 <li>on x86_64, it's <code>/usr/lib64/GNUstep/SOGo</code>.</li>
 </ul>
 <h2 id="start-sogo-and-dependent-services">Start SOGo and dependent services</h2>
-<pre><code># service sogod restart
-# service httpd restart     # &lt;- restart 'nginx' service if you're running Nginx
+<pre><code># service httpd restart     # &lt;- restart 'nginx' service if you're running Nginx
 # service memcached restart
+# service sogod restart
+</code></pre>
+
+<h2 id="add-dovecot-master-user-used-for-vacation-message-expiration">Add Dovecot Master User, used for vacation message expiration</h2>
+<h2 id="add-required-cron-jobs">Add required cron jobs</h2>
+<p>Please add below cron jobs for SOGo daemon user <code>sogo</code>. You can add them with
+command: <code>crontab -l -u sogo</code></p>
+<pre><code># iRedMail: SOGo email reminder, should be run every minute.
+*   *   *   *   *   /usr/sbin/sogo-ealarms-notify
+
+# iRedMail: SOGo session cleanup, should be run every minute.
+# Ajust the [X]Minutes parameter to suit your needs
+# Example: Sessions without activity since 30 minutes will be dropped:
+*   *   *   *   *   /usr/sbin/sogo-tool expire-sessions 30
+
+# iRedMail: SOGo vacation messages expiration
+# The credentials file should contain the sieve admin credentials (username:passwd)
+0   0   *   *   *   /usr/sbin/sogo-tool expire-autoreply -p /etc/sogo/sieve.cred
 </code></pre>
 
 <h2 id="access-sogo-from-web-browser">Access SOGo from web browser</h2>
@@ -288,7 +309,10 @@ word <code>SOGo</code> is case-sensitive), you can login with your email account
 <h2 id="configure-your-mail-clients-or-mobile-devices-to-use-caldavcarddav-services">Configure your mail clients or mobile devices to use CalDav/CardDAV services</h2>
 <p>Please check our documents <a href="./index.html#configure-mail-client-applications">here</a>
 to configure your mail clients or mobile devices.</p>
-<h2 id="references">References</h2><p style="text-align: center; color: grey;">Document published under a <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">CC BY-ND 3.0</a> license. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.<!-- Google Analytics -->
+<h2 id="todo">TODO</h2>
+<ul>
+<li>Add Dovecot Master User, for vacation message expiration</li>
+</ul><p style="text-align: center; color: grey;">Document published under a <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">CC BY-ND 3.0</a> license. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.<!-- Google Analytics -->
 <script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
diff --git a/integrations/0-sogo-centos-6-mysql.md b/integrations/0-sogo-centos-6-mysql.md
index 69bc168c..9fa00353 100644
--- a/integrations/0-sogo-centos-6-mysql.md
+++ b/integrations/0-sogo-centos-6-mysql.md
@@ -183,7 +183,10 @@ With below config file, SOGo will listen on address `127.0.0.1`, port `20000`.
 }
 ```
 
-## Enable ActiveSync support
+## Configure web server
+
+To access SOGo groupware (webmail/calendar/contact), we need to configure
+web server.
 
 ### Apache web server
 
@@ -270,9 +273,29 @@ the real directory which contains SOGo files:
 ## Start SOGo and dependent services
 
 ```
-# service sogod restart
 # service httpd restart     # <- restart 'nginx' service if you're running Nginx
 # service memcached restart
+# service sogod restart
+```
+
+## Add Dovecot Master User, used for vacation message expiration
+
+## Add required cron jobs
+Please add below cron jobs for SOGo daemon user `sogo`. You can add them with
+command: `crontab -l -u sogo`
+
+```
+# iRedMail: SOGo email reminder, should be run every minute.
+*   *   *   *   *   /usr/sbin/sogo-ealarms-notify
+
+# iRedMail: SOGo session cleanup, should be run every minute.
+# Ajust the [X]Minutes parameter to suit your needs
+# Example: Sessions without activity since 30 minutes will be dropped:
+*   *   *   *   *   /usr/sbin/sogo-tool expire-sessions 30
+
+# iRedMail: SOGo vacation messages expiration
+# The credentials file should contain the sieve admin credentials (username:passwd)
+0   0   *   *   *   /usr/sbin/sogo-tool expire-autoreply -p /etc/sogo/sieve.cred
 ```
 
 ## Access SOGo from web browser
@@ -285,5 +308,7 @@ word `SOGo` is case-sensitive), you can login with your email account credential
 Please check our documents [here](./index.html#configure-mail-client-applications)
 to configure your mail clients or mobile devices.
 
-## References
+## TODO
+
+* Add Dovecot Master User, for vacation message expiration
 
diff --git a/mua/configure.thunderbird.md b/mua/configure.thunderbird.md
index 42598853..3fa221e9 100644
--- a/mua/configure.thunderbird.md
+++ b/mua/configure.thunderbird.md
@@ -10,7 +10,7 @@ To create a new mail account with Thunderbird, please click menu: `File -> New -
 
 Add your name, email address and password in this screen.
 
-![](./images/thunderbird.new.mail.account.png "Thunderbird.new.mail.account.png")
+![](./images/thunderbird/new.mail.account.png)
 
 Click continue, it will detect IMAP and SMTP server automatically.
 
@@ -19,18 +19,18 @@ Note:
 * Login username must be full email address. You may want to click `Edit` to ensure it is correct.
 * If you want to use POP3 instead of IMAP, click "Edit" and change it to POP3 in this screen with port `110`, `STARTTLS`.
 
-![](./images/thunderbird.new.mail.account.setup.png "Thunderbird.new.mail.account.setup.png")
+![](./images/thunderbird/new.mail.account.setup.png)
 
 ## Configure Thunderbird as POP3 client
 Warning: Make sure you are using full email address as username.
 
-![](./images/thunderbird.pop3.png "Thunderbird.pop3.png")
+![](./images/thunderbird/pop3.png)
 
 ## Configure Thunderbird as IMAP client
 
 Warning: Make sure you are using full email address as username.
 
-![](./images/thunderbird.imap.png "Thunderbird.imap.png")
+![](./images/thunderbird/imap.png)
 
 ## Configure Thunderbird to send mail via SMTP
 
@@ -38,7 +38,7 @@ Menu: Tools -> Account settings... -> Outgoing server (SMTP) -> Choose the serve
 
 Warning: Make sure you are using full email address as username.
 
-![](./images/thunderbird.smtp.png "Thunderbird.smtp.png")
+![](./images/thunderbird/smtp.png)
 
 ## Use OpenLDAP as Global LDAP Address Book