diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index fa78f9d61b..62521bc4ac 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -17,6 +17,7 @@ limitations under the License.
 var MatrixClientPeg = require("./MatrixClientPeg");
 var CallHandler = require("./CallHandler");
 import { _t } from './languageHandler';
+import sdk from './index';
 import * as Roles from './Roles';
 
 function textForMemberEvent(ev) {
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 59d8c74022..8848a33deb 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -18,7 +18,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
 import ReactDOM from 'react-dom';
 import sdk from '../../../index';
 import Login from '../../../Login';
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index f12ef3ac9d..a4a117b9cb 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -118,7 +118,7 @@ module.exports = React.createClass({
             });
             options.push({ value: "Custom", text: "Custom level" });
             options = options.map((op) => {
-                return <option value={op.value}>{op.text}</option>;
+                return <option value={op.value} key={op.value}>{op.text}</option>;
             });
 
             select =
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index 9f69473dd6..65e1339daf 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -20,7 +20,7 @@ var React = require('react');
 
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var ContentRepo = require("matrix-js-sdk").ContentRepo;
-import { _tJsx } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
 import sdk from '../../../index';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -33,7 +33,7 @@ module.exports = React.createClass({
         mxEvent: React.PropTypes.object.isRequired,
     },
 
-    onAvatarClick: function(name, e) {
+    onAvatarClick: function(name) {
         var httpUrl = MatrixClientPeg.get().mxcUrlToHttp(this.props.mxEvent.getContent().url);
         var ImageView = sdk.getComponent("elements.ImageView");
         var params = {
@@ -49,7 +49,10 @@ module.exports = React.createClass({
         var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
         var room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
-        var name = room ? room.name : '';
+        var name = _t('%(senderDisplayName)s changed the avatar for %(roomName)s', {
+                senderDisplayName: senderDisplayName,
+                roomName: room ? room.name : '',
+        });
 
         if (!ev.getContent().url || ev.getContent().url.trim().length === 0) {
             return (
@@ -78,9 +81,9 @@ module.exports = React.createClass({
                          [
                             (sub) => senderDisplayName,
                             (sub) =>
-                                <AccessibleButton className="mx_RoomAvatarEvent_avatar"
-                                                  onClick={ this.onAvatarClick.bind(name) }>
-                                    <BaseAvatar width="14" height="14" url={ url }
+                                <AccessibleButton key="avatar" className="mx_RoomAvatarEvent_avatar"
+                                                  onClick={ this.onAvatarClick.bind(this, name) }>
+                                    <BaseAvatar width={14} height={14} url={ url }
                                                 name={ name } />
                                 </AccessibleButton>,
                          ]
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js
index 8319dbd434..088f7cbbc6 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.js
@@ -24,6 +24,11 @@ import sdk from '../../../index';
 module.exports = React.createClass({
     displayName: 'TextualEvent',
 
+    propTypes: {
+        /* the MatrixEvent to show */
+        mxEvent: React.PropTypes.object.isRequired,
+    },
+    
     render: function() {
         const EmojiText = sdk.getComponent('elements.EmojiText');
         var text = TextForEvent.textForEvent(this.props.mxEvent);
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index d9a6925793..e527f53170 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -38,6 +38,7 @@ var eventTileTypes = {
     'm.call.answer' : 'messages.TextualEvent',
     'm.call.hangup' : 'messages.TextualEvent',
     'm.room.name'   : 'messages.TextualEvent',
+    'm.room.avatar' : 'messages.RoomAvatarEvent',
     'm.room.topic'  : 'messages.TextualEvent',
     'm.room.third_party_invite' : 'messages.TextualEvent',
     'm.room.history_visibility' : 'messages.TextualEvent',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 15aa3916bc..95baf1f50e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -776,5 +776,8 @@
   "Online": "Online",
   "Idle": "Idle",
   "Offline": "Offline",
-  "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)"
+  "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)",
+  "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName changed the room avatar to <img/>",
+  "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
+  "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s"
 }