[MERGE] forward port of branch saas-3 up to f304fb7

2 files changed, 5 insertions, 1 deletions

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 4caff929e07..ba20cda873a 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
@@ -41,6 +42,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'
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8b62417e343..447dee08284 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -542,7 +542,7 @@ openerp.mail = function (session) {
                 };
 
                 self.do_action(action, {
-                    'on_close': function(){ self.parent_thread.message_fetch() }
+                    'on_close': function(){ self.is_log && self.parent_thread.message_fetch() }
                 });
                 self.on_cancel();
             });