diff --git a/4-howto/migrate.or.upgrade.iredadmin.md b/7-backup-restore-migration/migrate.or.upgrade.iredadmin.md
similarity index 91%
rename from 4-howto/migrate.or.upgrade.iredadmin.md
rename to 7-backup-restore-migration/migrate.or.upgrade.iredadmin.md
index 0b0a66d8..c29cc086 100644
--- a/4-howto/migrate.or.upgrade.iredadmin.md
+++ b/7-backup-restore-migration/migrate.or.upgrade.iredadmin.md
@@ -34,6 +34,5 @@ That's all. If it doesn't work for you, please post a new topic in our
## Addition optional steps
* If you want to quarantine SPAM/Virus into SQL database and manage them with
-iRedAdmin-Pro, please follow this tutorial to update Amavisd settings: [[IRedMail/FAQ/Quarantining.SPAM |Quarantining VIRUS and SPAM into SQL database]]
-
-TODO: Fix link in above line.
+iRedAdmin-Pro, please follow this tutorial to update Amavisd settings:
+[Quarantining SPAM and Virus emails into SQL database](./quarantining.html)
diff --git a/7-backup-restore-migration/migrate.to.new.iredmail.server.md b/7-backup-restore-migration/migrate.to.new.iredmail.server.md
index a2784e72..557e037e 100644
--- a/7-backup-restore-migration/migrate.to.new.iredmail.server.md
+++ b/7-backup-restore-migration/migrate.to.new.iredmail.server.md
@@ -1,4 +1,4 @@
-# How to migrate old iRedMail server to the latest stable release
+# Migrate old iRedMail server to the latest stable release
[TOC]
diff --git a/README.md b/README.md
index a86560bb..a3b96a79 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ We're working on migrating [old wiki documents](http://www.iredmail.org/wiki) to
* [LDAP: Add a mail alias account](src/default/4-howto/ldap.add.mail.alias.md)
* [LDAP: Add a mail list account](src/default/4-howto/ldap.add.mail.list.md)
* [LDAP: User mail forwarding.](src/default/4-howto/ldap.user.mail.forwarding.md)
-* [Migrate iRedAdmin open source edition to iRedAdmin-Pro](src/default/4-howto/migrate.or.upgrade.iredadmin.md)
* [Monitor incoming and outgoing mails with BCC](src/default/4-howto/monitor.incoming.and.outgoing.mails.with.bcc.md)
* [Pipe incoming email for certain user to external script ](src/default/4-howto/pipe.incoming.email.for.certain.user.to.external.script.md)
* [Quarantine clean mail into SQL database](src/default/4-howto/quarantining.clean.mail.md)
@@ -25,7 +24,8 @@ We're working on migrating [old wiki documents](http://www.iredmail.org/wiki) to
# Cluster solutions
* [An Ultra-HA, full Mult-Master E-mail cluster with iRedMail, MariaDB, and IPVS ](src/default/6-cluster/full.mult-master.iredmail.cluster.with.mariadb.and.ipvs.md)
# Backup, restore and migration
-* [How to migrate old iRedMail server to the latest stable release](src/default/7-backup-restore-migration/migrate.to.new.iredmail.server.md)
+* [Migrate iRedAdmin open source edition to iRedAdmin-Pro](src/default/7-backup-restore-migration/migrate.or.upgrade.iredadmin.md)
+* [Migrate old iRedMail server to the latest stable release](src/default/7-backup-restore-migration/migrate.to.new.iredmail.server.md)
* [Password hashes](src/default/7-backup-restore-migration/password.hashes.md)
# Troubleshooting and Debug
* [Turn on debug mode in Amavisd](src/default/9-troubleshooting/turn.on.debug.mode.in.amavisd.md)
diff --git a/SUMMARY.md b/SUMMARY.md
index 90acc408..db3cdadf 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -744,3 +744,71 @@
* [Turn on debug mode in OpenLDAP](turn.on.debug.mode.in.openldap.md)
# Frequently Asked Questions
* [Why append timestamp in maildir path](why.append.timestamp.in.maildir.path.md)
+# How to
+* [Allow user to send email without authentication](allow.user.to.send.email.without.authentication.md)
+* [Amavisd + SpamAssassin not working, no mail header (X-Spam-*) inserted.](amavisd.no.x-spam.headers.md)
+* [Completely disable Amavisd + ClamAV + SpamAssassin](completely.disable.amavisd.clamav.spamassassin.md)
+* [Configure Thunderbird as mail client (IMAP, SMTP and global ldap address book)](configure.thunderbird.md)
+* [Disable spam virus scanning for outgoing mails](disable.spam.virus.scanning.for.outgoing.mails.md)
+* [Enable SMTPS service (SMTP over SSL, port 465)](enable.smtps.md)
+* [Ignore Trash folder in mailbox quota](ignore.trash.folder.in.quota.md)
+* [LDAP: Add an alias domain](ldap.add.alias.domain.md)
+* [LDAP: Add a mail alias account](ldap.add.mail.alias.md)
+* [LDAP: Add a mail list account](ldap.add.mail.list.md)
+* [LDAP: User mail forwarding.](ldap.user.mail.forwarding.md)
+* [Migrate iRedAdmin open source edition to iRedAdmin-Pro](migrate.or.upgrade.iredadmin.md)
+* [Monitor incoming and outgoing mails with BCC](monitor.incoming.and.outgoing.mails.with.bcc.md)
+* [Pipe incoming email for certain user to external script ](pipe.incoming.email.for.certain.user.to.external.script.md)
+* [Quarantine clean mail into SQL database](quarantining.clean.mail.md)
+* [Quarantining](quarantining.md)
+* [Force Dovecot to recalculate mailbox quota](recalculate.mailbox.quota.md)
+* [SQL: Create an mail alias account with SQL command line](sql.create.mail.alias.md)
+* [Store SpamAssassin bayes in SQL](store.spamassassin.bayes.in.sql.md)
+* [Perform silent/unattended iRedMail installation](unattended.iredmail.installation.md)
+# Third-party integrations.
+* [SOGo: How to install SOGo on CentOS 6 with iRedMail (MySQL backend)](sogo-centos-6-mysql.md)
+# Cluster solutions
+* [An Ultra-HA, full Mult-Master E-mail cluster with iRedMail, MariaDB, and IPVS ](full.mult-master.iredmail.cluster.with.mariadb.and.ipvs.md)
+# Backup, restore and migration
+* [How to migrate old iRedMail server to the latest stable release](migrate.to.new.iredmail.server.md)
+* [Password hashes](password.hashes.md)
+# Troubleshooting and Debug
+* [Turn on debug mode in Amavisd](turn.on.debug.mode.in.amavisd.md)
+* [Turn on debug mode in Dovecot](turn.on.debug.mode.in.dovecot.md)
+* [Turn on debug mode in OpenLDAP](turn.on.debug.mode.in.openldap.md)
+# Frequently Asked Questions
+* [Why append timestamp in maildir path](why.append.timestamp.in.maildir.path.md)
+# How to
+* [Allow user to send email without authentication](allow.user.to.send.email.without.authentication.md)
+* [Amavisd + SpamAssassin not working, no mail header (X-Spam-*) inserted.](amavisd.no.x-spam.headers.md)
+* [Completely disable Amavisd + ClamAV + SpamAssassin](completely.disable.amavisd.clamav.spamassassin.md)
+* [Configure Thunderbird as mail client (IMAP, SMTP and global ldap address book)](configure.thunderbird.md)
+* [Disable spam virus scanning for outgoing mails](disable.spam.virus.scanning.for.outgoing.mails.md)
+* [Enable SMTPS service (SMTP over SSL, port 465)](enable.smtps.md)
+* [Ignore Trash folder in mailbox quota](ignore.trash.folder.in.quota.md)
+* [LDAP: Add an alias domain](ldap.add.alias.domain.md)
+* [LDAP: Add a mail alias account](ldap.add.mail.alias.md)
+* [LDAP: Add a mail list account](ldap.add.mail.list.md)
+* [LDAP: User mail forwarding.](ldap.user.mail.forwarding.md)
+* [Monitor incoming and outgoing mails with BCC](monitor.incoming.and.outgoing.mails.with.bcc.md)
+* [Pipe incoming email for certain user to external script ](pipe.incoming.email.for.certain.user.to.external.script.md)
+* [Quarantine clean mail into SQL database](quarantining.clean.mail.md)
+* [Quarantining](quarantining.md)
+* [Force Dovecot to recalculate mailbox quota](recalculate.mailbox.quota.md)
+* [SQL: Create an mail alias account with SQL command line](sql.create.mail.alias.md)
+* [Store SpamAssassin bayes in SQL](store.spamassassin.bayes.in.sql.md)
+* [Perform silent/unattended iRedMail installation](unattended.iredmail.installation.md)
+# Third-party integrations.
+* [SOGo: How to install SOGo on CentOS 6 with iRedMail (MySQL backend)](sogo-centos-6-mysql.md)
+# Cluster solutions
+* [An Ultra-HA, full Mult-Master E-mail cluster with iRedMail, MariaDB, and IPVS ](full.mult-master.iredmail.cluster.with.mariadb.and.ipvs.md)
+# Backup, restore and migration
+* [Migrate iRedAdmin open source edition to iRedAdmin-Pro](migrate.or.upgrade.iredadmin.md)
+* [Migrate old iRedMail server to the latest stable release](migrate.to.new.iredmail.server.md)
+* [Password hashes](password.hashes.md)
+# Troubleshooting and Debug
+* [Turn on debug mode in Amavisd](turn.on.debug.mode.in.amavisd.md)
+* [Turn on debug mode in Dovecot](turn.on.debug.mode.in.dovecot.md)
+* [Turn on debug mode in OpenLDAP](turn.on.debug.mode.in.openldap.md)
+# Frequently Asked Questions
+* [Why append timestamp in maildir path](why.append.timestamp.in.maildir.path.md)
diff --git a/html/index.html b/html/index.html
index 54b751df..5d5548b4 100644
--- a/html/index.html
+++ b/html/index.html
@@ -22,7 +22,6 @@
LDAP: Add a mail alias account
LDAP: Add a mail list account
LDAP: User mail forwarding.
-Migrate iRedAdmin open source edition to iRedAdmin-Pro
Monitor incoming and outgoing mails with BCC
Pipe incoming email for certain user to external script
Quarantine clean mail into SQL database
@@ -42,7 +41,8 @@
Backup, restore and migration
Troubleshooting and Debug
diff --git a/html/migrate.or.upgrade.iredadmin.html b/html/migrate.or.upgrade.iredadmin.html
index fc7125e6..d58f58f5 100644
--- a/html/migrate.or.upgrade.iredadmin.html
+++ b/html/migrate.or.upgrade.iredadmin.html
@@ -53,6 +53,6 @@ example, please replace x.y.z by the real file name. For example,
Addition optional steps
- If you want to quarantine SPAM/Virus into SQL database and manage them with
-iRedAdmin-Pro, please follow this tutorial to update Amavisd settings: [[IRedMail/FAQ/Quarantining.SPAM |Quarantining VIRUS and SPAM into SQL database]]
-
-TODO: Fix link in above line.
If you found something wrong in this document, please do conect us to fix it.