diff --git a/addons/crm/scripts/tinyerp-mailgate/Makefile b/addons/crm/scripts/tinyerp-mailgate/Makefile
deleted file mode 100644
index a5f91efa090..00000000000
--- a/addons/crm/scripts/tinyerp-mailgate/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-test:
-	fetchmail -f ./fetchmailrc -v -k
-
-test_sm:
-	/usr/lib/sendmail fp@tiny.be <mail.txt
diff --git a/addons/crm/scripts/tinyerp-mailgate/fetchmailrc b/addons/crm/scripts/tinyerp-mailgate/fetchmailrc
deleted file mode 100755
index 29cffd72277..00000000000
--- a/addons/crm/scripts/tinyerp-mailgate/fetchmailrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# .fetchmailrc
-
-poll pop.tiny.be proto pop3:
-username testcli@tiny.be password tiny mda "/home/pinky/code/terp/trunk/server/bin/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py -u3 -padmin -ssupport -etestcli@tiny.be -mfp@tiny.be -dterp"
-
diff --git a/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py b/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py
index f93f387a48d..2796934d079 100755
--- a/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py
+++ b/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py
@@ -127,7 +127,9 @@ class email_parser(object):
 				continue
 
 			if part.get_content_maintype()=='text' and part.get_content_subtype() == 'plain':
-				message['body'] += part.get_payload(decode=True).decode(part.get_charsets()[0])
+				buf = part.get_payload(decode=True)
+				if buf:
+					message['body'] += buf.decode(part.get_charsets()[0] or 'ascii', 'replace')
 			elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
 				filename = part.get_filename();
 				if filename :