diff --git a/modoboa/lib/email_utils.py b/modoboa/lib/email_utils.py
index caa4b955d..67d2b7be3 100644
--- a/modoboa/lib/email_utils.py
+++ b/modoboa/lib/email_utils.py
@@ -271,7 +271,7 @@ def split_address(address):
         local_part = address
         domain = None
     else:
-        local_part, domain = address.split("@", 1)
+        local_part, domain = address.rsplit("@", 1)
     return (local_part, domain)