diff --git a/nw/convert/text/tohtml.py b/nw/convert/text/tohtml.py
index 3a67df48..28d09bf3 100644
--- a/nw/convert/text/tohtml.py
+++ b/nw/convert/text/tohtml.py
@@ -41,9 +41,10 @@ class ToHtml(Tokenizer):
         Tokenizer.doAutoReplace(self)
 
         repDict = {
-            "<" : "&lt;",
-            ">" : "&gt;",
-            "&" : "&amp;",
+            "<"  : "&lt;",
+            ">"  : "&gt;",
+            "&"  : "&amp;",
+            "\t" : "&emsp;",
             nwUnicode.U_ENDASH : nwUnicode.H_ENDASH,
             nwUnicode.U_EMDASH : nwUnicode.H_EMDASH,
             nwUnicode.U_HELLIP : nwUnicode.H_HELLIP,
diff --git a/nw/convert/text/totext.py b/nw/convert/text/totext.py
index 5b226999..e6073012 100644
--- a/nw/convert/text/totext.py
+++ b/nw/convert/text/totext.py
@@ -30,6 +30,7 @@ class ToText(Tokenizer):
         Tokenizer.doAutoReplace(self)
 
         repDict = {
+            "\t" : "    ",
             nwUnicode.U_NBSP : " ",
         }
         xRep = re.compile("|".join([re.escape(k) for k in repDict.keys()]), flags=re.DOTALL)
@@ -92,7 +93,7 @@ class ToText(Tokenizer):
             # indicating a new paragraph.
             if tType == self.T_EMPTY:
                 if len(thisPar) > 0:
-                    tTemp = " ".join(thisPar)
+                    tTemp = "\n".join(thisPar)
                     self.theResult += "%s\n\n" % tTemp.rstrip()
                 thisPar = []
 
diff --git a/nw/convert/tokenizer.py b/nw/convert/tokenizer.py
index 7be25952..81543ad1 100644
--- a/nw/convert/tokenizer.py
+++ b/nw/convert/tokenizer.py
@@ -62,14 +62,14 @@ class Tokenizer():
         self.theTokens   = None
         self.theResult   = None
 
-        self.wordWrap    = 80
+        self.wordWrap    = 0
         self.doComments  = False
         self.doKeywords  = False
 
         self.fmtTitle    = "%title%"
-        self.fmtChapter  = "Chapter %numword%: %title%"
+        self.fmtChapter  = "%title%"
         self.fmtUnNum    = "%title%"
-        self.fmtScene    = "* * *"
+        self.fmtScene    = "%title%"
         self.fmtSection  = "%title%"
 
         self.hideScene   = False
@@ -224,7 +224,7 @@ class Tokenizer():
         isScene = self.theItem.itemLayout == nwItemLayout.SCENE
         isNote  = self.theItem.itemLayout == nwItemLayout.NOTE
 
-        # No special header formatting for notes and no layout files
+        # No special header formatting for notes and no-layout files
         if isNone: return
         if isNote: return
 
diff --git a/sample/sampleNovel/data_5/3b69b83cdafc_main.nwd b/sample/sampleNovel/data_5/3b69b83cdafc_main.nwd
index 9a7abf96..fcd759f0 100644
--- a/sample/sampleNovel/data_5/3b69b83cdafc_main.nwd
+++ b/sample/sampleNovel/data_5/3b69b83cdafc_main.nwd
@@ -2,3 +2,10 @@
 
 **By Jane Doh**
 
+More Text
+
+Even More Text
+
+What is this?
+
+Where is this?
\ No newline at end of file
diff --git a/sample/sampleNovel/data_b/a8a28a246524_main.nwd b/sample/sampleNovel/data_b/a8a28a246524_main.nwd
index fd3199ca..f6a5d16b 100644
--- a/sample/sampleNovel/data_b/a8a28a246524_main.nwd
+++ b/sample/sampleNovel/data_b/a8a28a246524_main.nwd
@@ -10,6 +10,6 @@ I understand equations, both the simple and quadratical
 About binomial theorem I'm teeming with a lot o’ news  
 With many cheerful facts about the square of the hypotenuse
 
-With many cheerful facts about the square of the hypotenuse  
-With many cheerful facts about the square of the hypotenuse  
-With many cheerful facts about the square of the hypotepotenuse
+	With many cheerful facts about the square of the hypotenuse  
+	With many cheerful facts about the square of the hypotenuse  
+	With many cheerful facts about the square of the hypotepotenuse
diff --git a/sample/sampleNovel/nwProject.nwx b/sample/sampleNovel/nwProject.nwx
index 847d7659..32567aed 100644
--- a/sample/sampleNovel/nwProject.nwx
+++ b/sample/sampleNovel/nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.3.2" fileVersion="1.0" timeStamp="2019-10-31 16:42:12">
+<novelWriterXML appVersion="0.3.2" fileVersion="1.0" timeStamp="2019-11-01 16:56:25">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
@@ -9,9 +9,9 @@
   </project>
   <settings>
     <spellCheck>True</spellCheck>
-    <lastEdited>b8136a5a774a0</lastEdited>
+    <lastEdited>53b69b83cdafc</lastEdited>
     <lastViewed>ba8a28a246524</lastViewed>
-    <lastWordCount>884</lastWordCount>
+    <lastWordCount>895</lastWordCount>
     <autoReplace>
       <A>B</A>
       <B>E</B>
@@ -48,10 +48,10 @@
       <status>Started</status>
       <expanded>False</expanded>
       <layout>TITLE</layout>
-      <charCount>23</charCount>
-      <wordCount>5</wordCount>
-      <paraCount>1</paraCount>
-      <cursorPos>16</cursorPos>
+      <charCount>73</charCount>
+      <wordCount>16</wordCount>
+      <paraCount>5</paraCount>
+      <cursorPos>85</cursorPos>
     </item>
     <item handle="e7ded148d6e4a" order="1" parent="7031beac91f75">
       <name>Some Chapter</name>
@@ -94,7 +94,7 @@
       <charCount>412</charCount>
       <wordCount>82</wordCount>
       <paraCount>2</paraCount>
-      <cursorPos>448</cursorPos>
+      <cursorPos>43</cursorPos>
     </item>
     <item handle="ba8a28a246524" order="3" parent="e7ded148d6e4a">
       <name>Interlude</name>
@@ -103,10 +103,10 @@
       <status>Finished</status>
       <expanded>False</expanded>
       <layout>UNNUMBERED</layout>
-      <charCount>630</charCount>
+      <charCount>633</charCount>
       <wordCount>101</wordCount>
       <paraCount>3</paraCount>
-      <cursorPos>648</cursorPos>
+      <cursorPos>164</cursorPos>
     </item>
     <item handle="96b68994dfa3d" order="4" parent="e7ded148d6e4a">
       <name>A Note on Ipsums</name>