diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
index b8b776d..61d7b04 100644
--- a/offlineimap/imaplibutil.py
+++ b/offlineimap/imaplibutil.py
@@ -20,6 +20,10 @@ import re, string, types, binascii, socket, time, random, subprocess, sys, os
 from offlineimap.ui import UIBase
 from imaplib import *
 
+# Import the symbols we need that aren't exported by default
+from imaplib import IMAP4_PORT, IMAP4_SSL_PORT, InternalDate, Mon2num
+
+
 class IMAP4_Tunnel(IMAP4):
     """IMAP4 client class over a tunnel
 
diff --git a/offlineimap/imapserver.py b/offlineimap/imapserver.py
index e0dfd28..6ea25eb 100644
--- a/offlineimap/imapserver.py
+++ b/offlineimap/imapserver.py
@@ -45,7 +45,7 @@ class UsefulIMAPMixIn:
             self.selectedfolder = None
 
     def _mesg(self, s, secs=None):
-        imaplibutil.new_mseg(self, s, secs)
+        imaplibutil.new_mesg(self, s, secs)
 
 class UsefulIMAP4(UsefulIMAPMixIn, imaplib.IMAP4):
     def open(self, host = '', port = imaplib.IMAP4_PORT):
@@ -55,7 +55,7 @@ class UsefulIMAP4_SSL(UsefulIMAPMixIn, imaplib.IMAP4_SSL):
     def open(self, host = '', port = imaplib.IMAP4_SSL_PORT):
         imaplibutil.new_open_ssl(self, host, port)
 
-class UsefulIMAP4_Tunnel(UsefulIMAPMixIn, imaplib.IMAP4_Tunnel): pass
+class UsefulIMAP4_Tunnel(UsefulIMAPMixIn, imaplibutil.IMAP4_Tunnel): pass
 
 class IMAPServer:
     def __init__(self, config, reposname,