diff --git a/src/public/main.js b/src/public/main.js
index e53a44d..0b8fa70 100644
--- a/src/public/main.js
+++ b/src/public/main.js
@@ -64,10 +64,18 @@ $(function() {
         message: message
       });
       // tell server to execute 'new message' and send along one parameter
-      socket.emit('new message', message);
+      socket.emit('new message', encrypt(message));
     }
   }
 
+  function encrypt(text) {
+    return CryptoJS.AES.encrypt(text, roomId).toString();
+  }
+
+  function decrypt(text) {
+    return CryptoJS.AES.decrypt(text, roomId).toString(CryptoJS.enc.Utf8);
+  }  
+
   // Log a message
   function log (message, options) {
     var $el = $('<li>').addClass('log').text(message);
@@ -236,6 +244,7 @@ $(function() {
 
   // Whenever the server emits 'new message', update the chat body
   socket.on('new message', function (data) {
+    data.message = decrypt(data.message);
     addChatMessage(data);
   });
 
diff --git a/src/views/index.mustache b/src/views/index.mustache
index 805f5f9..350e451 100644
--- a/src/views/index.mustache
+++ b/src/views/index.mustache
@@ -20,6 +20,7 @@
 
   <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
   <script src="https://cdn.socket.io/socket.io-1.4.3.js"></script>
+  <script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/aes.js"></script>
   <script src="/main.js"></script>
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){