From: Timo Sirainen <tss@iki.fi>
Date: Wed, 14 Jul 2010 12:52:47 +0000 (+0100)
Subject: mbox: When generating envelope to From_-line, don't append a second @owndomain if... 
X-Git-Tag: 2.0.rc3~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85afe3e73724f50f0063622648d288ac2d0184a2;p=thirdparty%2Fdovecot%2Fcore.git

mbox: When generating envelope to From_-line, don't append a second @owndomain if username already has one.
---

diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index 9911ec4bb2..9aa98044cd 100644
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -121,8 +121,11 @@ static int write_from_line(struct mbox_save_context *ctx, time_t received_date,
 			struct mail_storage *storage =
 				&ctx->mbox->storage->storage;
 
-			from_envelope = t_strconcat(storage->user->username,
-						    "@", my_hostdomain(), NULL);
+			from_envelope =
+				strchr(storage->user->username, '@') != NULL ?
+				storage->user->username :
+				t_strconcat(storage->user->username,
+					    "@", my_hostdomain(), NULL);
 		}
 
 		/* save in local timezone, no matter what it was given with */