--- mail-source.el~	2013-01-01 20:37:17.000000000 +0000
+++ mail-source.el	2013-04-26 02:34:39.395042300 +0000
@@ -799,3 +799,3 @@
 	  (mail-source-string (format "pop:%s@%s" user server))
-	  result)
+	  omailhost result)
       (when (eq authentication 'password)
@@ -807,3 +807,6 @@
       (when server
+	(setq omailhost (getenv "MAILHOST"))
 	(setenv "MAILHOST" server))
+(unwind-protect
+    (progn
       (setq result
@@ -859,3 +862,6 @@
 		    mail-source-password-cache))
-	0))))
+	0))
+  (when server
+    (setenv "MAILHOST" omailhost))))))
+
 
@@ -866,3 +872,3 @@
 	  (mail-source-string (format "pop:%s@%s" user server))
-	  result)
+	  omailhost result)
       (when (eq authentication 'password)
@@ -876,3 +882,6 @@
       (when server
+	(setq omailhost (getenv "MAILHOST"))
 	(setenv "MAILHOST" server))
+(unwind-protect
+    (progn
       (setq result
@@ -910,3 +919,5 @@
 		    mail-source-password-cache)))
-      result)))
+      result)
+  (when server
+    (setenv "MAILHOST" omailhost))))))