A fix for Sieve/Vacation bug. *** This may break networking. Test thoroughly please ***

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 95fe5396d57d82c18fcd88e5134c4ce7a9107d29..361f791a3e626776bbdaa6c95170da50028b36f8 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1679,7 +1679,16 @@ int CtdlOutputPreLoadedMsg(
                                else if (i == 'N')
                                        safestrncpy(snode, mptr, sizeof snode);
                                else if (i == 'R')
-                                       cprintf("To: %s%s", mptr, nl);
+                               {
+                                       if (haschar(mptr, '@') == 0)
+                                       {
+                                               cprintf("To: %s@%s%s", mptr, config.c_fqdn, nl);
+                                       }
+                                       else
+                                       {
+                                               cprintf("To: %s%s", mptr, nl);
+                                       }
+                               }
                                else if (i == 'T') {
                                        datestring(datestamp, sizeof datestamp,
                                                atol(mptr), DATESTRING_RFC822);