diff --git a/redirects.txt b/redirects.txt
index 3e620dd14..f00f5236d 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -200,7 +200,7 @@ applications/general/payment_acquirers/wire_transfer.rst applications/finance/pa
 discuss/monitoring.rst applications/productivity/discuss/overview/get_started.rst                    # (#655)
 discuss/mentions.rst applications/productivity/discuss/overview/get_started.rst                      # (#655)
 discuss/tracking.rst applications/services/project/tasks/collaborate.rst                         # (#655)
-discuss/email_servers.rst applications/productivity/discuss/advanced/email_servers.rst               # (#655)
+discuss/email_servers.rst applications/general/email_communication/email_servers.rst                 # (#655)
 discuss/plan_activities.rst applications/productivity/discuss/overview/plan_activities.rst           # (#655)
 discuss/team_communication.rst applications/productivity/discuss/overview/team_communication.rst     # (#655)
 discuss/overview.rst applications/productivity/discuss/overview/get_started.rst                      # (#655)
@@ -225,6 +225,8 @@ applications/general/developer_mode/activate.rst applications/general/developer_
 applications/general/odoo_basics/users.rst applications/general/users.rst                                 # odoo_basics/users -> users
 applications/general/odoo_basics/choose_language.rst  applications/general/users/language.rst             # odoo_basics/choose_language -> users/language
 applications/general/auth/google_spreadsheets.rst applications/sales/crm/performance/google_spreadsheets.rst  # general/auth/* -> sales/crm/performance/
+applications/productivity/discuss/advanced/email_servers.rst applications/general/email_communication/email_servers.rst     # productivity/discuss/advanced/* -> general/email_communication/*
+applications/productivity/discuss/advanced/email_template.rst applications/general/email_communication/email_template.rst   # productivity/discuss/advanced/* -> general/email_communication/*
 
 applications/finance/sign/overview/signature_validity.rst applications/finance/sign.rst        # sign/overview/signature_validity -> sign/*
 
@@ -287,7 +289,3 @@ purchase/replenishment/flows/compute_date.rst applications/inventory_and_mrp/inv
 purchase/replenishment/flows/purchase_triggering.rst applications/inventory_and_mrp/purchase/products/reordering.rst				# (#814)
 purchase/replenishment/flows/setup_stock_rule.rst applications/inventory_and_mrp/purchase/products/reordering.rst					# (#814)
 purchase/replenishment/multicompany/setup.rst applications/general/multi_companies/manage_multi_companies.rst	# (#814)
-applications/finance/sign/overview/signature_validity.rst applications/finance/sign.rst        #sign/overview/signature_validity -> sign/*
-
-applications/productivity/discuss/advanced/email_servers.rst applications/general/email_communication/email_servers.rst
-applications/productivity/discuss/advanced/email_template.rst applications/general/email_communication/email_template.rst