diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 0a27a05b275..84e48c794fd 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import logging
+import poplib
 import time
 from imaplib import IMAP4
 from imaplib import IMAP4_SSL
@@ -42,6 +43,9 @@ from openerp.tools.translate import _
 _logger = logging.getLogger(__name__)
 MAX_POP_MESSAGES = 50
 
+# Workaround for Python 2.7.8 bug https://bugs.python.org/issue23906
+poplib._MAXLINE = 65536
+
 class fetchmail_server(osv.osv):
     """Incoming POP/IMAP mail server account"""
     _name = 'fetchmail.server'