diff --git a/anki/importing/csvfile.py b/anki/importing/csvfile.py
index bd0b1ff4b..612cdd27a 100644
--- a/anki/importing/csvfile.py
+++ b/anki/importing/csvfile.py
@@ -132,6 +132,6 @@ class TextImporter(NoteImporter):
 
     def noteFromFields(self, fields):
         note = ForeignNote()
-        note.fields.extend([x.strip().replace("\n", "<br>") for x in fields])
+        note.fields.extend([x for x in fields])
         note.tags.extend(self.tagsToAdd)
         return note
diff --git a/anki/importing/noteimp.py b/anki/importing/noteimp.py
index fd3a7877a..e9e435d67 100644
--- a/anki/importing/noteimp.py
+++ b/anki/importing/noteimp.py
@@ -120,9 +120,10 @@ class NoteImporter(Importer):
         dupeCount = 0
         dupes = []
         for n in notes:
-            if not self.allowHTML:
-                for c in range(len(n.fields)):
+            for c in range(len(n.fields)):
+                if not self.allowHTML:
                     n.fields[c] = cgi.escape(n.fields[c])
+                n.fields[c] = n.fields[c].strip().replace("\n", "<br>")
             fld0 = n.fields[fld0idx]
             csum = fieldChecksum(fld0)
             # first field must exist