3 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 30bb393e..59454999 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,7 @@ fetchmail 6.3.3 (not yet released):
 * fetchmail no longer replaces the local user ID for an empty envelope sender
   when using the proprietary SDPS extension for POP3. Fixes Debian Bug#353575,
   reported by Roger Lynn.
+* --idle can now be specified on the command line, too.
 
 fetchmail 6.3.2 (released 2006-01-22):
 
diff --git a/TODO b/TODO
index e4474082..f797c3dd 100644
--- a/TODO
+++ b/TODO
@@ -4,11 +4,7 @@ For 6.3.X:
 Casper Gripenberg's 6.3.2 no-IDLE/NOOP hang with EXISTS (see full trace
 and patch on fetchmail-devel).
 
---idle on command line?
-
-Roger Lynn's Debian Bug#353575 and Bug#316446 comment.
-Quick SDPS-specific workaround is implemented (rev 4693:4694)
-but needs testing.
+Clean up null envelope handling everywhere to get rid of <> kludge.
 
 Use Errors-To: as envelope sender fallback?
 
diff --git a/options.c b/options.c
index 9ffc09fc..67da077e 100644
--- a/options.c
+++ b/options.c
@@ -49,6 +49,7 @@ enum {
     LA_FETCHSIZELIMIT,
     LA_FASTUIDL,
     LA_LIMITFLUSH,
+    LA_IDLE,
 };
 
 /* options still left: CgGhHjJoORTWxXYz */
@@ -78,6 +79,7 @@ static const struct option longoptions[] = {
   {"protocol",	required_argument, (int *) 0, 'p' },
   {"proto",	required_argument, (int *) 0, 'p' },
   {"uidl",	no_argument,	   (int *) 0, 'U' },
+  {"idle",	no_argument,	   (int *) 0, LA_IDLE},
   {"port",	required_argument, (int *) 0, 'P' },
   {"service",	required_argument, (int *) 0, 'P' },
   {"auth",	required_argument, (int *) 0, LA_AUTH},
@@ -334,6 +336,9 @@ struct query *ctl;	/* option record to be initialized */
 	case 'U':
 	    ctl->server.uidl = FLAG_TRUE;
 	    break;
+	case LA_IDLE:
+	    ctl->idle = FLAG_TRUE;
+	    break;
 	case 'P':
 	    ctl->server.service = optarg;
 	    break;