diff --git a/xvaga/xvtmail.cpp b/xvaga/xvtmail.cpp
index 2d369b953..974b2b33f 100755
--- a/xvaga/xvtmail.cpp
+++ b/xvaga/xvtmail.cpp
@@ -42,7 +42,9 @@ static bool GetMailParams(wxString& smtp, wxString& port, wxString& user, wxStri
   port = GetMailParam("Port");
   user = GetMailParam("User");
   pass = GetMailParam("Password");
-  wxString f = user; f += "@"; f += smtp.AfterFirst('.');
+  wxString f = user; 
+  if (f.find('@') < 0) 
+  { f += "@"; f += smtp.AfterFirst('.'); }
   from = GetMailParam("From", f);
 
   return !smtp.IsEmpty() && !pass.IsEmpty();