diff --git a/spec/editor-component-spec.coffee b/spec/editor-component-spec.coffee
index 28f740531..e150baf49 100644
--- a/spec/editor-component-spec.coffee
+++ b/spec/editor-component-spec.coffee
@@ -88,6 +88,32 @@ describe "EditorComponent", ->
       expect(component.lineNodeForScreenRow(3).offsetTop).toBe 3 * lineHeightInPixels
       expect(component.lineNodeForScreenRow(4).offsetTop).toBe 4 * lineHeightInPixels
 
+    describe "when showInvisibles is enabled", ->
+      beforeEach ->
+        atom.config.set("editor.showInvisibles", true)
+
+      it "displays spaces, tabs, and newlines as visible charachters", ->
+        editor.setText " a line with tabs\tand spaces "
+        eol = '\u00ac'
+        space = '\u00b7'
+        tab = '\u00bb'
+        cr = '\u00a4'
+        expect(component.lineNodeForScreenRow(0).textContent).toBe "#{space}a line with tabs#{tab} and spaces#{space}#{eol}"
+
+      it "displays newlines as their own token outside of the other tokens scope", ->
+
+      it "allows invisible glyphs to be customized via the editor.invisibles config", ->
+
+      it "displays trailing carriage return using a visible non-empty value", ->
+
+      describe "when soft wrapping is enabled", ->
+        beforeEach ->
+          editor.setSoftWrap(true)
+
+        it "doesn't show the end of line invisible at the end of lines broken due to wrapping", ->
+
+        it "displays trailing carriage return using a visible non-empty value", ->
+
     describe "when indent guides are enabled", ->
       beforeEach ->
         component.setShowIndentGuide(true)
diff --git a/src/lines-component.coffee b/src/lines-component.coffee
index 1cae8b8fb..72b1ca730 100644
--- a/src/lines-component.coffee
+++ b/src/lines-component.coffee
@@ -140,6 +140,12 @@ LinesComponent = React.createClass
     innerHTML = ""
 
     scopeStack = []
+    invisibles =
+      eol: '\u00ac'
+      space: '\u00b7'
+      tab: '\u00bb'
+      cr: '\u00a4'
+
     firstTrailingWhitespacePosition = text.search(/\s*$/)
     lineIsWhitespaceOnly = firstTrailingWhitespacePosition is 0
     for token in tokens
@@ -147,6 +153,7 @@ LinesComponent = React.createClass
       hasIndentGuide = not mini and showIndentGuide and token.hasLeadingWhitespace or (token.hasTrailingWhitespace and lineIsWhitespaceOnly)
       innerHTML += token.getValueAsHtml({invisibles, hasIndentGuide})
     innerHTML += @popScope(scopeStack) while scopeStack.length > 0
+    innerHTML += invisibles.eol
     innerHTML
 
   updateScopeStack: (scopeStack, desiredScopes) ->