5 files changed, 11 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 78176466..23c4d7f4 100644
--- a/NEWS
+++ b/NEWS
@@ -273,6 +273,7 @@ fetchmail 6.3.0 (not yet released officially):
   if we cannot qualify our own hostname, so we aren't losing the bounce.
   Instead, pass the buck on to the SMTP server and use our own unqualified
   hostname. Matthias Andree
+* Revise some error messages so they are less confusing. Sunil Shetye.
 
 # INTERNAL CHANGES
 * Switched to automake. Matthias Andree.
diff --git a/driver.c b/driver.c
index f978c341..c00294ec 100644
--- a/driver.c
+++ b/driver.c
@@ -1510,13 +1510,14 @@ is restored."));
 	break;
     }
     if (msg) {
-	const char *stem;
-
-	if (phase == FORWARDING_WAIT || phase == LISTENER_WAIT)
-	    stem = GT_("%s error while delivering to SMTP host %s\n");
+	if (phase == FORWARDING_WAIT || phase == LISTENER_WAIT
+		|| err == PS_SMTP)
+	    report(stderr, GT_("%s error while fetching from %s@%s and delivering to SMTP host %s\n"),
+		    msg, ctl->remotename, ctl->server.pollname,
+		    ctl->smtphost ? ctl->smtphost : GT_("unknown"));
 	else
-	    stem = GT_("%s error while fetching from %s\n");
-	report(stderr, stem, msg, ctl->server.pollname);
+	    report(stderr, GT_("%s error while fetching from %s@%s\n"),
+		    msg, ctl->remotename, ctl->server.pollname);
     }
 
 closeUp:
diff --git a/etrn.c b/etrn.c
index 2a7e1aca..de97fea9 100644
--- a/etrn.c
+++ b/etrn.c
@@ -156,7 +156,7 @@ int doETRN (struct query *ctl)
 	return(PS_SYNTAX);
     }
     if (ctl->mailboxes->id) {
-	fprintf(stderr, GT_("Option --remote is not supported with ETRN\n"));
+	fprintf(stderr, GT_("Option --folder is not supported with ETRN\n"));
 	return(PS_SYNTAX);
     }
     if (check_only) {
diff --git a/odmr.c b/odmr.c
index 427d0796..7d4d4dca 100644
--- a/odmr.c
+++ b/odmr.c
@@ -245,7 +245,7 @@ int doODMR (struct query *ctl)
 	return(PS_SYNTAX);
     }
     if (ctl->mailboxes->id) {
-	fprintf(stderr, GT_("Option --remote is not supported with ODMR\n"));
+	fprintf(stderr, GT_("Option --folder is not supported with ODMR\n"));
 	return(PS_SYNTAX);
     }
     if (check_only) {
diff --git a/pop3.c b/pop3.c
index a18f8bc8..12f2d999 100644
--- a/pop3.c
+++ b/pop3.c
@@ -1273,7 +1273,7 @@ int doPOP3 (struct query *ctl)
 {
 #ifndef MBOX
     if (ctl->mailboxes->id) {
-	fprintf(stderr,GT_("Option --remote is not supported with POP3\n"));
+	fprintf(stderr,GT_("Option --folder is not supported with POP3\n"));
 	return(PS_SYNTAX);
     }
 #endif /* MBOX */