diff --git a/index.template.html b/index.template.html
index 54404f0b6..1e5037528 100644
--- a/index.template.html
+++ b/index.template.html
@@ -95,6 +95,7 @@
 		<script src="//play.pokemonshowdown.com/data/pokedex-mini.js?"></script>
 		<script src="//play.pokemonshowdown.com/js/battle.js?"></script>
 		<script src="//play.pokemonshowdown.com/js/lib/sockjs-0.3.min.js"></script>
+		<script src="//play.pokemonshowdown.com/js/storage.js?"></script>
 
 		<script src="//play.pokemonshowdown.com/js/client.js?"></script>
 		<script src="//play.pokemonshowdown.com/js/client-mainmenu.js?"></script>
diff --git a/js/client-chat.js b/js/client-chat.js
index 7dc7d40da..22c679d25 100644
--- a/js/client-chat.js
+++ b/js/client-chat.js
@@ -945,6 +945,7 @@
 				} else {
 					outputChat();
 				}
+				Storage.logChat(this.id, '* '+name+' '+message);
 			} else if (message.substr(0,5) === '/mee ') {
 				message = message.substr(5);
 				if (showme) {
@@ -952,8 +953,10 @@
 				} else {
 					outputChat();
 				}
+				Storage.logChat(this.id, '* '+name+message);
 			} else if (message.substr(0,10) === '/announce ') {
 				this.$chat.append(chatDiv + timestamp + '<strong style="' + color + '">' + clickableName + ':</strong> <span class="message-announce">' + Tools.parseMessage(message.substr(10), name) + '</span></div>');
+				Storage.logChat(this.id, ''+name+': /announce '+message);
 			} else if (message.substr(0,6) === '/warn ') {
 				app.addPopup(RulesPopup, {warning: message.substr(6)});
 			} else if (message.substr(0,14) === '/data-pokemon ') {
@@ -968,6 +971,7 @@
 				// Normal chat message.
 				if (message.substr(0,2) === '//') message = message.substr(1);
 				outputChat();
+				Storage.logChat(this.id, ''+name+': '+message);
 			}
 		}
 	}, {