diff --git a/core/modules/parsers/csvparser.js b/core/modules/parsers/csvparser.js
new file mode 100644
index 000000000..e359de6b5
--- /dev/null
+++ b/core/modules/parsers/csvparser.js
@@ -0,0 +1,53 @@
+/*\
+title: $:/core/modules/parsers/csvparser.js
+type: application/javascript
+module-type: parser
+
+The CSV text parser processes CSV files into a table wrapped in a scrollable widget
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var CsvParser = function(type,text,options) {
+	// Table framework
+	this.tree = [{
+		"type": "element", "tag": "$scrollable", "children": [{
+			"type": "element", "tag": "table", "children": [{
+				"type": "element", "tag": "tbody", "children": []
+			}], "attributes": {
+				"class": {"type": "string", "value": "tw-csv-table"}
+			}
+		}]
+	}];
+	// Split the text into lines
+	var lines = text.split(/\r?\n/mg),
+		tag = "th";
+	for(var line=0; line<lines.length; line++) {
+		var lineText = lines[line];
+		if(lineText) {
+			var row = {
+					"type": "element", "tag": "tr", "children": []
+				};
+			var columns = lineText.split(",");
+			for(var column=0; column<columns.length; column++) {
+				row.children.push({
+						"type": "element", "tag": tag, "children": [{
+							"type": "text",
+							"text": columns[column]
+						}]
+					});
+			}
+			tag = "td";
+			this.tree[0].children[0].children[0].children.push(row);
+		}
+	}
+};
+
+exports["text/csv"] = CsvParser;
+
+})();
+
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index d1a95e086..674913969 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -109,6 +109,10 @@ table tfoot tr td {
 	background-color: <<colour table-footer-background>>;
 }
 
+.tw-csv-table {
+	white-space: nowrap;
+}
+
 .tw-tiddler-frame img, .tw-tiddler-frame svg, .tw-tiddler-frame canvas, .tw-tiddler-frame embed {
 	max-width: 100%;
 }