diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 3ce9413..e198e68 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,3 +1,9 @@
+offlineimap (3.99.18) unstable; urgency=low
+
+  * Made a fix for Python2.3 compatibility.
+
+ -- John Goerzen <jgoerzen@complete.org>  Tue, 27 May 2003 16:58:54 -0500
+
 offlineimap (3.99.17) unstable; urgency=low
 
   * Fixed two potential obscure race conditions in folder/Maildir.py.
diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/offlineimap/head/offlineimap/folder/IMAP.py
index bc1b4cb..0871fbf 100644
--- a/offlineimap/head/offlineimap/folder/IMAP.py
+++ b/offlineimap/head/offlineimap/folder/IMAP.py
@@ -130,8 +130,9 @@ class IMAPFolder(BaseFolder):
         ui.debug('imap', 'savemessage_addheader: insertionpoint = %d' % insertionpoint)
         leader = content[0:insertionpoint]
         ui.debug('imap', 'savemessage_addheader: leader = %s' % repr(leader))
-        if insertionpoint == 0:
+        if insertionpoint == 0 or insertionpoint == -1:
             newline = ''
+            insertionpoint = 0
         else:
             newline = "\r\n"
         newline += "%s: %s" % (headername, headervalue)
diff --git a/offlineimap/head/offlineimap/imaplib.py b/offlineimap/head/offlineimap/imaplib.py
index baf00b1..3827533 100644
--- a/offlineimap/head/offlineimap/imaplib.py
+++ b/offlineimap/head/offlineimap/imaplib.py
@@ -1129,7 +1129,7 @@ class IMAP4_SSL(IMAP4):
         self.port = port
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sock.connect((host, port))
-        self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
+        self.sslobj = socket.ssl(self.sock._sock, self.keyfile, self.certfile)
         self.sslobj = sslwrapper(self.sslobj)