diff --git a/changelog.html b/changelog.html
index 88269937..a8412b21 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">3.5.310 <time datetime="2016-10-03">(2016-10-04)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Twitch broke message handling by deciding <em>every</em> message is a system message. I'll fix it properly later.</li>
+</ul>
+
 <div class="list-header">3.5.309 <time datetime="2016-10-03">(2016-10-03)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Properly position the Theater Mode metadata bar when whispers are at the bottom of the screen.</li>
diff --git a/src/ember/line.js b/src/ember/line.js
index da5595c1..0939c99f 100644
--- a/src/ember/line.js
+++ b/src/ember/line.js
@@ -916,6 +916,10 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
 			return ! this.get('hasSystemMsg') || this.get('hasMessageBody');
 		}.property('hasSystemMsg', 'hasMessageBody'),
 
+		systemMsg: function() {
+			return this.get('msgObject.tags.system-msg')
+		}.property('msgObject.tags.system-msg'),
+
 		//shouldRenderMessageBody: function() {
 		//	return false;
 		//}.property('hasSystemMsg', 'hasMessageBody'),
diff --git a/src/main.js b/src/main.js
index 9147ffd6..566cb14c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ FFZ.msg_commands = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 309,
+	major: 3, minor: 5, revision: 310,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}