diff --git a/tools/archiver.py b/tools/archiver.py
index e0bc99c..fa7d49a 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -405,8 +405,10 @@
                     # Allow wrapping to be done on the client display by unwrapping
                     # to a single long line.
                     # The value 2000 should be more than enough for most email paragraphs.
-                    body = formatflowed.convertToWrapped(to_crlf(saved_body), width=2000, wrap_fixed=False, character_set="utf-8")
+                    # body = formatflowed.convertToWrapped(to_crlf(saved_body), width=2000, wrap_fixed=False, character_set="utf-8")
                     # formatflowed requires CRLF line endings, but generates LF endings...
+                    # TEMP: disable conversion until can work out how to fix tests
+                    body = formatflowed.convertToWrapped(saved_body, width=2000, wrap_fixed=False, character_set="utf-8")
                 except:
                     pass # Don't try to recover