2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 66f2b43f..297ba86a 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@
 ------------------------------------------------------------------------------
 fetchmail-4.0.4 ()
 * Overhauled the build machinery.
+* The `no envelope' option now suppresses parsing or Received lines.
 * Added Al Youngwerth as a backup maintainer.
 
 fetchmail-4.0.3 (Mon Jul 28 16:39:17 EDT 1997)
diff --git a/driver.c b/driver.c
index 44e2e309..80ad930d 100644
--- a/driver.c
+++ b/driver.c
@@ -711,7 +711,11 @@ char *realname;		/* real name of host */
 	    ctt_offs = (line - headers);
 
 #ifdef HAVE_RES_SEARCH
-	else if (MULTIDROP(ctl) && !received_for && !strncasecmp("Received:", line, 9))
+	/*
+	 * The `no envelope' option should also disable parsing of Received
+	 * lines.
+	 */
+	else if (MULTIDROP(ctl) && ctl->server.envelope != STRING_DISABLED && !received_for && !strncasecmp("Received:", line, 9))
 	    received_for = parse_received(ctl, line);
 #endif /* HAVE_RES_SEARCH */
     }