diff --git a/lib/soa-mail.php b/lib/soa-mail.php
index 5bacffd..abaa94f 100644
--- a/lib/soa-mail.php
+++ b/lib/soa-mail.php
@@ -24,5 +24,5 @@ function mail_to_soa($mail) {
     $parts = explode("@", $mail);
     $parts[0] = str_replace(".", "\.", $parts[0]);
     $parts[] = "";
-    return implode(".", $parts);
-}
\ No newline at end of file
+    return rtrim(implode(".", $parts), ".");
+}