diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 6a1585fae4a..91f926c3fbc 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -140,11 +140,14 @@ main (argc, argv)
   }
 
 #ifdef MAIL_USE_POP
-  if (!bcmp (inname, "po:", 3))
+  if (!strncmp (inname, "po:", 3))
     {
       int status; char *user;
 
-      user = (char *) rindex (inname, ':') + 1;
+      for (user = &inname[strlen (inname) - 1]; user >= inname; user--)
+	if (*user == ':')
+	  break;
+
       status = popmail (user, outname);
       exit (status);
     }