diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.4-0.9.5.md b/en_US/upgrade/0-upgrade.iredmail.0.9.4-0.9.5.md
index 53c61945..42a35b93 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.4-0.9.5.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.4-0.9.5.md
@@ -348,7 +348,7 @@ $log_templ = '
 OTHER|CLEAN|MTA-BLOCKED|OVERSIZED|BAD-HEADER-[:ccat|minor]|SPAMMY|SPAM|\
 UNCHECKED[?[:ccat|minor]||-ENCRYPTED|]|BANNED (%F)|INFECTED (%V)]#
  {[:actions_performed]}#
-,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] [:mail_addr_decode_octets|%s] -> [%D|[:mail_addr_decode_octets|%D]|,]#
+,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] %s -> [%D|,]#
 [? %q ||, quarantine: %q]#
 [? %Q ||, Queue-ID: %Q]#
 [? %m ||, Message-ID: [:mail_addr_decode_octets|%m]]#
@@ -371,7 +371,7 @@ UNCHECKED[?[:ccat|minor]||-ENCRYPTED|]|BANNED (%F)|INFECTED (%V)]#
 OTHER|CLEAN|MTA-BLOCKED|OVERSIZED|BAD-HEADER-[:ccat|minor]|SPAMMY|SPAM|\
 UNCHECKED[?[:ccat|minor]||-ENCRYPTED|]|BANNED (%F)|INFECTED (%V)]#
  {[:actions_performed]}#
-,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] [:mail_addr_decode_octets|%s] -> [%O|[:mail_addr_decode_octets|%O]|,]#
+,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] %s -> [%D|,]#
 [? %q ||, quarantine: %q]#
 [? %Q ||, Queue-ID: %Q]#
 [? %m ||, Message-ID: [:mail_addr_decode_octets|%m]]#
diff --git a/en_US/upgrade/0-upgrade.sogo.combined.sql.tables.md b/en_US/upgrade/0-upgrade.sogo.combined.sql.tables.md
index c2059335..2c75aac0 100644
--- a/en_US/upgrade/0-upgrade.sogo.combined.sql.tables.md
+++ b/en_US/upgrade/0-upgrade.sogo.combined.sql.tables.md
@@ -1,6 +1,6 @@
 # Upgrade SOGo SQL schema
 
-With default SOGo settings in iRedMail-0.9.5-1 and earler releases, SOGo will
+With default SOGo settings in iRedMail-0.9.5-1 and earlier releases, SOGo will
 create 3 SQL tables for each user, this introduces some issues:
 
 * Your `sogo` database will contains lots of sql tables.
diff --git a/html/upgrade.iredmail.0.9.4-0.9.5.html b/html/upgrade.iredmail.0.9.4-0.9.5.html
index 6493ff23..ff25f6b2 100644
--- a/html/upgrade.iredmail.0.9.4-0.9.5.html
+++ b/html/upgrade.iredmail.0.9.4-0.9.5.html
@@ -392,7 +392,7 @@ $log_templ = '
 OTHER|CLEAN|MTA-BLOCKED|OVERSIZED|BAD-HEADER-[:ccat|minor]|SPAMMY|SPAM|\
 UNCHECKED[?[:ccat|minor]||-ENCRYPTED|]|BANNED (%F)|INFECTED (%V)]#
  {[:actions_performed]}#
-,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] [:mail_addr_decode_octets|%s] -> [%D|[:mail_addr_decode_octets|%D]|,]#
+,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] %s -> [%D|,]#
 [? %q ||, quarantine: %q]#
 [? %Q ||, Queue-ID: %Q]#
 [? %m ||, Message-ID: [:mail_addr_decode_octets|%m]]#
@@ -415,7 +415,7 @@ UNCHECKED[?[:ccat|minor]||-ENCRYPTED|]|BANNED (%F)|INFECTED (%V)]#
 OTHER|CLEAN|MTA-BLOCKED|OVERSIZED|BAD-HEADER-[:ccat|minor]|SPAMMY|SPAM|\
 UNCHECKED[?[:ccat|minor]||-ENCRYPTED|]|BANNED (%F)|INFECTED (%V)]#
  {[:actions_performed]}#
-,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] [:mail_addr_decode_octets|%s] -> [%O|[:mail_addr_decode_octets|%O]|,]#
+,[?%p|| %p][?%a||[?%l|| LOCAL] [:client_addr_port]][?%e|| \[%e\]] %s -> [%D|,]#
 [? %q ||, quarantine: %q]#
 [? %Q ||, Queue-ID: %Q]#
 [? %m ||, Message-ID: [:mail_addr_decode_octets|%m]]#
diff --git a/html/upgrade.sogo.combined.sql.tables.html b/html/upgrade.sogo.combined.sql.tables.html
index 4e3b4335..54e56dfb 100644
--- a/html/upgrade.sogo.combined.sql.tables.html
+++ b/html/upgrade.sogo.combined.sql.tables.html
@@ -16,7 +16,7 @@
         <span>iRedMail</span>
     </a>
     &nbsp;&nbsp;//&nbsp;&nbsp;<a href="./index.html">Document Index</a></div><h1 id="upgrade-sogo-sql-schema">Upgrade SOGo SQL schema</h1>
-<p>With default SOGo settings in iRedMail-0.9.5-1 and earler releases, SOGo will
+<p>With default SOGo settings in iRedMail-0.9.5-1 and earlier releases, SOGo will
 create 3 SQL tables for each user, this introduces some issues:</p>
 <ul>
 <li>Your <code>sogo</code> database will contains lots of sql tables.</li>