diff --git a/demo/demo_startup.js b/demo/demo_startup.js
index dcc9f42a..c754b1ad 100644
--- a/demo/demo_startup.js
+++ b/demo/demo_startup.js
@@ -57,8 +57,17 @@ exports.launch = function(env) {
 
     var docs = {};
 
+    // Make the lorem ipsum text a little bit longer.
+    var loreIpsum = document.getElementById("plaintext").innerHTML;
+    for (var i = 0; i < 5; i++) {
+        loreIpsum += loreIpsum;
+    }
+    docs.plain = new Document(loreIpsum);
+    docs.plain.setUseWrapMode(true);
+    docs.plain.setMode(new TextMode());
+    docs.plain.setUndoManager(new UndoManager());
+
     docs.js = new Document(document.getElementById("jstext").innerHTML);
-    docs.js.setUseWrapMode(true);
     docs.js.setMode(new JavaScriptMode());
     docs.js.setUndoManager(new UndoManager());
 
diff --git a/editor.html b/editor.html
index a6b28321..bf35fb44 100644
--- a/editor.html
+++ b/editor.html
@@ -6,14 +6,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>Editor</title>
     <meta name="author" content="Fabian Jakobs">
-    
+
     <style type="text/css" media="screen">
-    
+
     html {
         height: 100%;
         overflow: hidden;
     }
-    
+
     body {
         overflow: hidden;
         margin: 0;
@@ -25,18 +25,18 @@
         background: rgb(14, 98, 165);
         color: white;
     }
-    
-    #editor {  
+
+    #editor {
         top: 55px;
         left: 0px;
         background: white;
     }
-    
+
     #controls {
         width: 100%;
         height: 55px;
     }
-  
+
     #jump {
         position: absolute;
         width: 10px;
@@ -45,7 +45,7 @@
         z-index: 10000;
         display: none;
     }
-    
+
     #cockpitInput {
         position: absolute;
         width: 100%;
@@ -69,7 +69,7 @@
 </head>
 <body>
     <div id="jump"></div>
-    
+
     <table id="controls">
       <tr>
         <td>
@@ -80,6 +80,7 @@
           <option value="css">CSS Document</option>
           <option value="python">Python Document</option>
           <option value="php">PHP Document</option>
+          <option value="plain">Text Document</option>
         </select>
       </td>
       <td>
@@ -107,21 +108,21 @@
       </td>
       <td>
         <label for="select_style">Full line selections</label>
-        <input type="checkbox" name="select_style" id="select_style" checked>        
+        <input type="checkbox" name="select_style" id="select_style" checked>
       </td>
       <td>
         <label for="highlight_active">Highlight active line</label>
-        <input type="checkbox" name="highlight_active" id="highlight_active" checked>        
+        <input type="checkbox" name="highlight_active" id="highlight_active" checked>
       </td>
       <td align="right">
-        <img src="demo/logo.png">        
+        <img src="demo/logo.png">
       </td>
       </tr>
     </table>
 
-    <div id="editor">    
+    <div id="editor">
     </div>
-    
+
     <script type="text/editor" id="jstext">function foo(items) {
     for (var i=0; i<items.length; i++) {
         alert(items[i] + "juhu");
@@ -152,7 +153,7 @@
 </html></script>
 
     <script type="text/editor" id="pythontext">#!/usr/local/bin/python
-    
+
 import string, sys
 
 # If no arguments were given, print a helpful message
@@ -162,7 +163,7 @@ if len(sys.argv)==1:
 
 # Loop over the arguments
 for i in sys.argv[1:]:
-    try: 
+    try:
         fahrenheit=float(string.atoi(i))
     except string.atoi_error:
         print repr(i), "not a numeric value"
@@ -196,5 +197,17 @@ echo $output;
   <script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
   <script src="demo/boot.js" type="text/javascript"></script>
 
+  <script type="text/editor" id="plaintext">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
+</script>
 </body>
 </html>
diff --git a/lib/ace/document.js b/lib/ace/document.js
index 5610ac35..11ca900d 100644
--- a/lib/ace/document.js
+++ b/lib/ace/document.js
@@ -773,7 +773,7 @@ var Document = function(text, mode) {
 
 
 (function() {
-    this.$wrapLimit = 24;
+    this.$wrapLimit = 80;
     this.$useWrapMode = false;
     this.setUseWrapMode = function(useWrapMode) {
         var _self = this;
@@ -933,10 +933,7 @@ var Document = function(text, mode) {
 
     this.documentToScreenRow = function(row) {
         if (!this.$useWrapMode) {
-            return {
-                row: row,
-                column: this.documentToScreenColumn(row, column)
-            }
+            return row;
         }
 
         var wrapData = this.$wrapData;
