diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
index 5eee92c8098..cf158a0686c 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -4697,7 +4697,7 @@ protected function _responseCode(
             /* Store valid search charsets if returned by server. */
             $s = $this->search_charset;
             foreach ($rc->data[0] as $val) {
-                $this->search_charset->setValid($val, true);
+                $s->setValid($val, true);
             }
 
             throw new Horde_Imap_Client_Exception_ServerResponse(
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Url/Pop3.php b/framework/Imap_Client/lib/Horde/Imap/Client/Url/Pop3.php
index b57210ba767..68015c9c8cb 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Url/Pop3.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Url/Pop3.php
@@ -49,7 +49,7 @@ public function __toString()
         $url = 'pop://' . parent::__toString();
 
         if (($port = $this->port) != 110) {
-            $url .= ':' . $this->port;
+            $url .= ':' . $port;
         }
 
         return $url . '/';