diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 722121f070..9343984363 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -1347,6 +1347,14 @@ noteEditor.applyAnnotationColors = Show Annotation Colors
 noteEditor.removeAnnotationColors = Hide Annotation Colors
 noteEditor.addCitations = Show Annotation Citations
 noteEditor.removeCitations = Hide Annotation Citations
+noteEditor.insertTable = Insert Table
+noteEditor.insertRowBefore = Insert Row Above
+noteEditor.insertRowAfter = Insert Row Below
+noteEditor.insertColumnBefore = Insert Column Left
+noteEditor.insertColumnAfter = Insert Column Right
+noteEditor.deleteRow = Delete Row
+noteEditor.deleteColumn = Delete Column
+noteEditor.deleteTable = Delete Table
 
 pdfReader.annotations = Annotations
 pdfReader.showAnnotations = Show Annotations
diff --git a/chrome/skin/default/zotero/report/detail.css b/chrome/skin/default/zotero/report/detail.css
index bef2122b46..5af23659b0 100644
--- a/chrome/skin/default/zotero/report/detail.css
+++ b/chrome/skin/default/zotero/report/detail.css
@@ -170,3 +170,21 @@ ul.attachments div.note {
 ul.attachments div.note p:first-child {
 	margin-top: .75em;
 }
+
+div table {
+	border-collapse: collapse;
+}
+
+div table td, div table th {
+	border: 1px #ccc solid;
+	border-collapse: collapse;
+}
+
+
+div table td *:first-child, div table th *:first-child {
+	margin-top: 0;
+}
+
+div table td *:last-child, div table th *:last-child {
+	margin-bottom: 0;
+}
diff --git a/note-editor b/note-editor
index 0d84a3ec10..0ac27d39b6 160000
--- a/note-editor
+++ b/note-editor
@@ -1 +1 @@
-Subproject commit 0d84a3ec1028ac8f224a9167d44c76c35523e8eb
+Subproject commit 0ac27d39b606ef781ff4cae74f1c80840a497743