--- telepathy-butterfly-0.5.8/butterfly/channel/text.py	2010-04-08 10:00:17.000000000 -0300
+++ telepathy-butterfly-0.5.8-patched/butterfly/channel/text.py	2010-05-18 19:27:48.000000000 -0300
@@ -22,6 +22,7 @@
 import logging
 import weakref
 import time
+import re
 
 import dbus
 import telepathy
@@ -280,7 +281,7 @@
         handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
                 sender.account, sender.network_id)
         type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL
-        message = message.content
+        message = re.sub('\r\n','\n',message.content)
         logger.info("User %s sent a message" % unicode(handle))
         self._signal_text_received(id, timestamp, handle, type, 0, message)
         self._recv_id += 1