diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml
index 049399f0e..16b97706f 100644
--- a/chrome/content/zotero/bindings/styled-textbox.xml
+++ b/chrome/content/zotero/bindings/styled-textbox.xml
@@ -344,8 +344,24 @@
// Register handler for deferred setting of content
var self = this;
var listener = function() {
+ var win = self._iframe.contentWindow;
var SJOW = self._iframe.contentWindow.wrappedJSObject;
+ if (!SJOW.tinyMCE) {
+ var exts = Zotero.getInstalledExtensions();
+ for each(var ext in exts) {
+ if (ext.indexOf('NoScript') != -1) {
+ var warning = win.document.getElementById('noScriptWarning');
+ var str = "The NoScript extension is preventing Zotero "
+ + "from displaying notes. To use NoScript and Zotero together, "
+ + "whitelist the 'file://' scheme in the NoScript preferences.";
+ warning.appendChild(document.createTextNode(str));
+ break;
+ }
+ }
+ return;
+ }
+
var editor = SJOW.tinyMCE.get("tinymce");
if (!editor) {
// Not ready yet
diff --git a/chrome/content/zotero/tinymce/css/note-ui.css b/chrome/content/zotero/tinymce/css/note-ui.css
index 99a742dfc..0e687a687 100644
--- a/chrome/content/zotero/tinymce/css/note-ui.css
+++ b/chrome/content/zotero/tinymce/css/note-ui.css
@@ -33,3 +33,9 @@ td.mceIframeContainer {
#tinymce_formatselect_text {
width: 65px;
}
+
+#noScriptWarning {
+ padding: 4px;
+ font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
diff --git a/chrome/content/zotero/tinymce/integration.html b/chrome/content/zotero/tinymce/integration.html
index f46d276e8..f6fc2d283 100755
--- a/chrome/content/zotero/tinymce/integration.html
+++ b/chrome/content/zotero/tinymce/integration.html
@@ -1,7 +1,6 @@
-
@@ -40,6 +44,6 @@ html, body {
-
+
diff --git a/chrome/content/zotero/tinymce/note.html b/chrome/content/zotero/tinymce/note.html
index e7d59700d..75060f263 100755
--- a/chrome/content/zotero/tinymce/note.html
+++ b/chrome/content/zotero/tinymce/note.html
@@ -1,7 +1,6 @@
-TinyMCE
-
+
diff --git a/chrome/content/zotero/tinymce/noteview.html b/chrome/content/zotero/tinymce/noteview.html
index 84edc6fd7..40793220b 100644
--- a/chrome/content/zotero/tinymce/noteview.html
+++ b/chrome/content/zotero/tinymce/noteview.html
@@ -57,6 +57,6 @@ table.mceLayout > tbody > tr.mceLast {
-
+