diff --git a/src/ember/room.js b/src/ember/room.js
index df5d9802..c1b78503 100644
--- a/src/ember/room.js
+++ b/src/ember/room.js
@@ -1016,7 +1016,7 @@ FFZ.prototype._modify_room = function(room) {
 
 		// Artificial chat delay
 		pushMessage: function(msg) {
-			if ( f.settings.chat_delay !== 0 ) {
+			if ( f.settings.chat_delay !== 0 || (this.ffzPending && this.ffzPending.length) ) {
 				if ( ! this.ffzPending )
 					this.ffzPending = [];
 
diff --git a/src/main.js b/src/main.js
index 4e2448d0..6f1f26d9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,7 +21,7 @@ FFZ.get = function() { return FFZ.instance; }
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 13,
+	major: 3, minor: 5, revision: 14,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/src/ui/notifications.js b/src/ui/notifications.js
index 4ee8bb1e..f6328cd1 100644
--- a/src/ui/notifications.js
+++ b/src/ui/notifications.js
@@ -8,6 +8,18 @@ var FFZ = window.FrankerFaceZ;
 FFZ.prototype.setup_notifications = function() {
 	this.log("Adding event handler for window focus.");
 	window.addEventListener("focus", this.clear_notifications.bind(this));
+
+	// Firefox update warning.
+	if ( navigator.userAgent.toLowerCase().indexOf('firefox/') !== -1 ) {
+		if ( localStorage.hasOwnProperty('ffz_mozilla_sign_warning') )
+			return;
+
+		localStorage.ffz_mozilla_sign_warning = true;
+		var f = this;
+		setTimeout(function() {
+			f.show_message('Firefox users please re-download the add-on from <a href="https://www.frankerfacez.com/" target="_new">https://www.frankerfacez.com/</a> to ensure that it continues to function after the upgrade to Firefox 41. You should see version 1.56 in your add-ons listing.');
+		}, 1000);
+	}
 }
 
 
@@ -73,7 +85,7 @@ FFZ.settings_info.notification_timeout = {
 			var parsed = parseInt(new_val);
 			if ( parsed === NaN || parsed < 1 )
 				parsed = 60;
-			
+
 			this.settings.set("notification_timeout", parsed);
 		}
 	};