diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 7e7a670aea..55b68d1eb1 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -96,8 +96,8 @@ module.exports = React.createClass({
             else {
                 joinText = (<span>
                     {_tJsx(
-                        "Join as <a>voice</a> or <a>video</a>.",
-                        [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                        "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
+                        [/<voiceText>(.*?)<\/voiceText>/, /<videoText>(.*?)<\/videoText>/],
                         [
                             (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{sub}</a>,
                             (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{sub}</a>,
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 8aa1f353a6..34166452cb 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -138,8 +138,8 @@ module.exports = React.createClass({
                     </div>
                     <div className="mx_RoomPreviewBar_join_text">
                         { _tJsx(
-                            'Would you like to <a>accept</a> or <a>decline</a> this invitation?',
-                            [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                            'Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?',
+                            [/<acceptText>(.*?)<\/acceptText>/, /<declineText>(.*?)<\/declineText>/],
                             [
                                 (sub) => <a onClick={ this.props.onJoinClick }>{sub}</a>,
                                 (sub) => <a onClick={ this.props.onRejectClick }>{sub}</a>
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index f31fc68afc..997c451aa0 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -754,7 +754,7 @@ module.exports = React.createClass({
         if (this.state.join_rule === "public" && aliasCount == 0) {
             addressWarning =
                 <div className="mx_RoomSettings_warning">
-                		{ _tJsx(
+                        { _tJsx(
                             'To link to a room it must have <a>an address</a>.',
                             /<a>(.*?)<\/a>/,
                             (sub) => <a href="#addresses">{sub}</a>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3619424d19..d29c26aa28 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -365,7 +365,7 @@
   "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
   "%(displayName)s is typing": "%(displayName)s is typing",
   "Sign in with": "Sign in with",
-  "Join as <a>voice</a> or <a>video</a>.": "Join as <a>voice</a> or <a>video</a>.",
+  "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
   "Join Room": "Join Room",
   "joined and left": "joined and left",
   "joined": "joined",
@@ -647,7 +647,7 @@
   "Who would you like to communicate with?": "Who would you like to communicate with?",
   "Searching known users": "Searching known users",
   "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-  "Would you like to <a>accept</a> or <a>decline</a> this invitation?": "Would you like to <a>accept</a> or <a>decline</a> this invitation?",
+  "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?",
   "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
   "You are already in a call.": "You are already in a call.",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",