diff --git a/appl/popper/pop_get_subcommand.c b/appl/popper/pop_get_subcommand.c
index 5e37de880..78652339b 100644
--- a/appl/popper/pop_get_subcommand.c
+++ b/appl/popper/pop_get_subcommand.c
@@ -13,6 +13,9 @@ RCSID("$Id$");
 
 static xtnd_table subcommands[] = {
         {"xmit",     0,  0,  pop_xmit},
+#ifdef XOVER
+	{"xover",    0,  0,  pop_xover},
+#endif
         {NULL}
 };
 
diff --git a/appl/popper/popper.h b/appl/popper/popper.h
index 59b69a19f..5b8aef9c6 100644
--- a/appl/popper/popper.h
+++ b/appl/popper/popper.h
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <protos.h>
 #define UIDL
+#define XOVER
 #define DEBUG
 #define RETURN_PATH_HANDLING
 #endif
@@ -183,9 +184,14 @@ typedef struct {                                /*  Message information */
                                                     is marked for deletion */
     int         retr_flag;                      /*  Flag indicating if message 
                                                     was retrieved */
-#ifdef UIDL
+#if defined(UIDL) || defined(XOVER)
     char        *msg_id;	                /*  The POP UIDL uniqueifier */
 #endif
+#ifdef XOVER
+    char	*subject;
+    char	*from;
+    char	*date;
+#endif
 } MsgInfoList;
 
 typedef struct  {                               /*  POP parameter block */
@@ -279,6 +285,9 @@ int pop_xtnd(POP *p);
 #ifdef UIDL
 int pop_uidl(POP *p);
 #endif
+#ifdef XOVER
+int pop_xover(POP *p);
+#endif
 int pop_help(POP *p);
 state_table *pop_get_command(POP *p, char *mp);
 void pop_lower(char *buf);