X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Freceive.c;h=7c56f47baaa2031699be2855d256fb1ce5814019;hp=0b3546317f7d92fe2c6925d8df8e257e268c22d1;hb=250b68713b5810a824bb14337b98737b6b81bf53;hpb=7ade712cc84d7f822f04baf2f46daee81701174d

diff --git a/src/src/receive.c b/src/src/receive.c
index 0b3546317..7c56f47ba 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -2303,9 +2303,23 @@ if (extract_recip)
         pp = recipient = store_get(ss - s + 1);
         for (p = s; p < ss; p++) if (*p != '\n') *pp++ = *p;
         *pp = 0;
+
+#ifdef EXPERIMENTAL_INTERNATIONAL
+	{
+	BOOL b = allow_utf8_domains;
+	allow_utf8_domains = TRUE;
+#endif
         recipient = parse_extract_address(recipient, &errmess, &start, &end,
           &domain, FALSE);
 
+#ifdef EXPERIMENTAL_INTERNATIONAL
+	if (string_is_utf8(recipient))
+	  message_smtputf8 = TRUE;
+	else
+	  allow_utf8_domains = b;
+	}
+#endif
+
         /* Keep a list of all the bad addresses so we can send a single
         error message at the end. However, an empty address is not an error;
         just ignore it. This can come from an empty group list like