handle domain == "@" properly.

1 files changed, 3 insertions, 0 deletions

diff --git a/init.c b/init.c
index 2ad615b4..8af87bcc 100644
--- a/init.c
+++ b/init.c
@@ -1548,10 +1548,13 @@ void mutt_init (int skip_sys_rc, LIST *commands)
     Fqdn = safe_strdup ("@");
   else
 #endif /* DOMAIN */
+    if (*DOMAIN != '@')
   {
     Fqdn = safe_malloc (strlen (DOMAIN) + strlen (NONULL(Hostname)) + 2);
     sprintf (Fqdn, "%s.%s", NONULL(Hostname), DOMAIN);
   }
+  else
+    Fqdn = safe_strdup(NONULL(Hostname));
 
   if ((p = getenv ("MAIL")))
     Spoolfile = safe_strdup (p);