diff --git a/features/core.feature b/features/core.feature
index 61cba8c9..99d933ae 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -26,6 +26,21 @@ Feature: Basic reading and writing to a journal
             | There is a blank line above this.
             """
 
+    Scenario: Printing a journal that has multiline entries with tags
+        Given we use the config "multiline-tags.yaml"
+        When we run "jrnl -n 1"
+        Then we should get no error
+        and the output should be
+            """
+            [2013-06-09 15:39] Multiple @line entry with @tags.
+            | Tag with @punctuation. afterwards
+            | @TagOnLineAloneWithOutPunctuation
+            | @TagOnLineAloneWithPunctuation.
+            | Text before @tag. And After.
+            | @hi. Hello
+            | hi Hello
+            """
+
     Scenario: Writing an entry from command line
         Given we use the config "basic.yaml"
         When we run "jrnl 23 july 2013: A cold and stormy day. I ate crisps on the sofa."
diff --git a/features/data/configs/multiline-tags.yaml b/features/data/configs/multiline-tags.yaml
new file mode 100644
index 00000000..033aaa27
--- /dev/null
+++ b/features/data/configs/multiline-tags.yaml
@@ -0,0 +1,17 @@
+default_hour: 9
+default_minute: 0
+editor: ""
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/multiline-tags.journal
+linewrap: 80
+tagsymbols: "@"
+template: false
+timeformat: "%Y-%m-%d %H:%M"
+indent_character: "|"
+colors:
+  date: none
+  title: none
+  body: none
+  tags: none
diff --git a/features/data/journals/multiline-tags.journal b/features/data/journals/multiline-tags.journal
new file mode 100644
index 00000000..1fb8706f
--- /dev/null
+++ b/features/data/journals/multiline-tags.journal
@@ -0,0 +1,7 @@
+[2013-06-09 15:39] Multiple @line entry with @tags.
+Tag with @punctuation. afterwards
+@TagOnLineAloneWithOutPunctuation
+@TagOnLineAloneWithPunctuation.
+Text before @tag. And After.
+@hi. Hello
+hi Hello
\ No newline at end of file