X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Finternet_addressing.c;fp=citadel%2Finternet_addressing.c;h=99b22d786ff7f73ec06a46cb2926c3a17b65d170;hp=a8868e954c7a12320e4567113473ccd5bb82ef72;hb=c4609169aa7baf208848e72c16d33a3f892353b8;hpb=85306faf2231501cf896f4227bc6cb30daa6e849

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index a8868e954..99b22d786 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -1227,9 +1227,9 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
 		process_rfc822_addr(value, user, node, name);
 		syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name);
 		snprintf(addr, sizeof(addr), "%s@%s", user, node);
-		if (CM_IsEmpty(msg, eAuthor))
+		if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name))
 			CM_SetField(msg, eAuthor, name, strlen(name));
-		if (CM_IsEmpty(msg, erFc822Addr))
+		if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr))
 			CM_SetField(msg, erFc822Addr, addr, strlen(addr));
 		processed = 1;
 	}