diff --git a/jrnl/Entry.py b/jrnl/Entry.py
index 66b32f6c..fb85ed0e 100755
--- a/jrnl/Entry.py
+++ b/jrnl/Entry.py
@@ -48,11 +48,11 @@ class Entry:
         if not short and self.journal.config['linewrap']:
             title = textwrap.fill(date_str + " " + self.title, self.journal.config['linewrap'])
             body = "\n".join([
-                    textwrap.fill((line + " ") if (len(line) == 0) else line,
+                    textwrap.fill(line,
                         self.journal.config['linewrap'],
-                        initial_indent="| ",
-                        subsequent_indent="| ",
-                        drop_whitespace=False)
+                        initial_indent=self.journal.config['indent'] + " ",
+                        subsequent_indent=self.journal.config['indent'] + " ")
+                            or self.journal.config['indent']
                     for line in self.body.rstrip(" \n").splitlines()
                 ])
         else:
diff --git a/jrnl/Journal.py b/jrnl/Journal.py
index 92a6774f..76e618a5 100644
--- a/jrnl/Journal.py
+++ b/jrnl/Journal.py
@@ -29,6 +29,7 @@ class Journal(object):
             'tagsymbols': '@',
             'highlight': True,
             'linewrap': 80,
+            'indent': "|"
         }
         self.config.update(kwargs)
         # Set up date parser