diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 37a9bcd0cd..e5f4f08572 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -200,11 +201,9 @@ module.exports = React.createClass({
 
     _createOverflowTile: function(overflowCount, totalCount) {
         // For now we'll pretend this is any entity. It should probably be a separate tile.
-        var EntityTile = sdk.getComponent("rooms.EntityTile");
-        var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        var text = (overflowCount > 1)
-        	? _t("and %(overflowCount)s others...", { overflowCount: overflowCount })
-        	: _t("and one other...");
+        const EntityTile = sdk.getComponent("rooms.EntityTile");
+        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+        const text = _t("and %(count)s others...", { count: overflowCount });
         return (
             <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
                 <BaseAvatar url="img/ellipsis.svg" name="..." width={36} height={36} />
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 4412fc539f..45ad2c6b9e 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -117,9 +117,7 @@ var SearchableEntityList = React.createClass({
     _createOverflowEntity: function(overflowCount, totalCount) {
         var EntityTile = sdk.getComponent("rooms.EntityTile");
         var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        var text = (overflowCount > 1)
-        	? _t("and %(overflowCount)s others...", { overflowCount: overflowCount })
-        	: _t("and one other...");
+        const text = _t("and %(count)s others...", { count: overflowCount });
         return (
             <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
                 <BaseAvatar url="img/ellipsis.svg" name="..." width={36} height={36} />
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 68cfec2cd9..e855abffc0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -552,8 +552,10 @@
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
     "Failed to join the room": "Fehler beim Betreten des Raumes",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Eine Textnachricht wurde an +%(msisdn)s gesendet. Bitte gebe den Verifikationscode ein, den er beinhaltet",
-    "and %(overflowCount)s others...": "und %(overflowCount)s weitere...",
-    "and one other...": "und ein(e) weitere(r)...",
+    "and %(count)s others...": {
+        "other": "und %(count)s weitere...",
+        "one": "und ein(e) weitere(r)..."
+    },
     "Are you sure?": "Bist du sicher?",
     "Attachment": "Anhang",
     "Ban": "Dauerhaft aus dem Raum ausschließen",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index d339508488..bf96278fbd 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -175,8 +175,10 @@
     "an address": "μία διεύθηνση",
     "%(items)s and %(remaining)s others": "%(items)s και %(remaining)s ακόμα",
     "%(items)s and one other": "%(items)s και ένας ακόμα",
-    "and %(overflowCount)s others...": "και %(overflowCount)s άλλοι...",
-    "and one other...": "και ένας ακόμα...",
+    "and %(count)s others...": {
+        "other": "και %(count)s άλλοι...",
+        "one": "και ένας ακόμα..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s και %(lastPerson)s γράφουν",
     "%(names)s and one other are typing": "%(names)s και ένας ακόμα γράφουν",
     "%(names)s and %(count)s others are typing": "%(names)s και %(count)s άλλοι γράφουν",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c6c563ac5b..86cf8727bb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -157,8 +157,10 @@
     "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
     "%(items)s and one other": "%(items)s and one other",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
-    "and %(overflowCount)s others...": "and %(overflowCount)s others...",
-    "and one other...": "and one other...",
+    "and %(count)s others...": {
+        "other": "and %(count)s others...",
+        "one": "and one other..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
     "%(names)s and one other are typing": "%(names)s and one other are typing",
     "%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 6a2a326870..47bb96ed14 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -154,8 +154,10 @@
     "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
     "%(items)s and one other": "%(items)s and one other",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
-    "and %(overflowCount)s others...": "and %(overflowCount)s others...",
-    "and one other...": "and one other...",
+    "and %(count)s others...": {
+        "other": "and %(count)s others...",
+        "one": "and one other..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
     "%(names)s and one other are typing": "%(names)s and one other are typing",
     "%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index f7506b946d..05b1abffd7 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -140,8 +140,10 @@
     "%(items)s and %(remaining)s others": "%(items)s y %(remaining)s otros",
     "%(items)s and one other": "%(items)s y otro",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
-    "and %(overflowCount)s others...": "y %(overflowCount)s otros...",
-    "and one other...": "y otro...",
+    "and %(count)s others...": {
+        "other": "y %(count)s otros...",
+        "one": "y otro..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
     "%(names)s and one other are typing": "%(names)s y otro están escribiendo",
     "%(names)s and %(count)s others are typing": "%(names)s y %(count)s otros están escribiendo",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9f6fdf3391..9ae015eaff 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -188,8 +188,10 @@
     "%(items)s and %(remaining)s others": "%(items)s et %(remaining)s autres",
     "%(items)s and one other": "%(items)s et un autre",
     "%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
-    "and %(overflowCount)s others...": "et %(overflowCount)s autres...",
-    "and one other...": "et un autre...",
+    "and %(count)s others...": {
+        "other": "et %(count)s autres...",
+        "one": "et un autre..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s sont en train de taper",
     "%(names)s and one other are typing": "%(names)s et un autre sont en train de taper",
     "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train de taper",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 8335976a06..2d1f07c34e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -190,8 +190,10 @@
     "%(items)s and %(remaining)s others": "%(items)s és még: %(remaining)s",
     "%(items)s and one other": "%(items)s és még egy",
     "%(items)s and %(lastItem)s": "%(items)s és %(lastItem)s",
-    "and %(overflowCount)s others...": "és még: %(overflowCount)s ...",
-    "and one other...": "és még egy...",
+    "and %(count)s others...": {
+        "other": "és még: %(count)s ...",
+        "one": "és még egy..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s és %(lastPerson)s írnak",
     "%(names)s and one other are typing": "%(names)s és még valaki ír",
     "%(names)s and %(count)s others are typing": "%(names)s és %(count)s ember ír",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 601f7d1ce0..52970db2ed 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -225,8 +225,10 @@
     "%(items)s and %(remaining)s others": "%(items)s과 %(remaining)s",
     "%(items)s and one other": "%(items)s과 다른 하나",
     "%(items)s and %(lastItem)s": "%(items)s과 %(lastItem)s",
-    "and %(overflowCount)s others...": "그리고 %(overflowCount)s...",
-    "and one other...": "그리고 다른 하나...",
+    "and %(count)s others...": {
+        "other": "그리고 %(count)s...",
+        "one": "그리고 다른 하나..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s님과 %(lastPerson)s님이 입력중",
     "%(names)s and one other are typing": "%(names)s님과 다른 분이 입력중",
     "%(names)s and %(count)s others are typing": "%(names)s님과 %(count)s 분들이 입력중",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 95c5e0ee78..ae2cf977ea 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -141,8 +141,10 @@
     "%(items)s and %(remaining)s others": "%(items)s en %(remaining)s andere",
     "%(items)s and one other": "%(items)s en één andere",
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
-    "and %(overflowCount)s others...": "en %(overflowCount)s andere...",
-    "and one other...": "en één andere...",
+    "and %(count)s others...": {
+        "other": "en %(count)s andere...",
+        "one": "en één andere..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s en %(lastPerson)s zijn aan het typen",
     "%(names)s and one other are typing": "%(names)s en één andere zijn aan het typen",
     "%(names)s and %(count)s others are typing": "%(names)s en %(count)s andere zijn aan het typen",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 0405d000af..16ffc1f107 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -556,8 +556,10 @@
     "%(items)s and %(remaining)s others": "%(items)s e %(remaining)s outros",
     "%(items)s and one other": "%(items)s e um outro",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
-    "and %(overflowCount)s others...": "e %(overflowCount)s outros...",
-    "and one other...": "e um outro...",
+    "and %(count)s others...": {
+        "other": "e %(count)s outros...",
+        "one": "e um outro..."
+    },
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
     "Autoplay GIFs and videos": "Reproduzir automaticamente GIFs e videos",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 4820104aa1..330dc8f143 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -557,8 +557,10 @@
     "%(items)s and %(remaining)s others": "%(items)s e %(remaining)s outros",
     "%(items)s and one other": "%(items)s e um outro",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
-    "and %(overflowCount)s others...": "e %(overflowCount)s outros...",
-    "and one other...": "e um outro...",
+    "and %(count)s others...": {
+        "other": "e %(count)s outros...",
+        "one": "e um outro..."
+    },
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
     "Autoplay GIFs and videos": "Reproduzir automaticamente GIFs e videos",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 76a047d079..cad0617ae2 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -448,7 +448,10 @@
     "sx": "Суту",
     "zh-hk": "Китайский (Гонконг)",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "На +%(msisdn)s было отправлено текстовое сообщение. Пожалуйста, введите проверочный код из него",
-    "and %(overflowCount)s others...": "и %(overflowCount)s других...",
+    "and %(count)s others...": {
+        "other": "и %(count)s других...",
+        "one": "и ещё один..."
+    },
     "Are you sure?": "Вы уверены?",
     "Autoplay GIFs and videos": "Проигрывать GIF и видео автоматически",
     "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Невозможно соединиться с домашним сервером - проверьте своё соединение и убедитесь, что <a>SSL-сертификат вашего домашнего сервера</a> включён в доверяемые.",
@@ -479,7 +482,6 @@
     "%(items)s and %(remaining)s others": "%(items)s и другие %(remaining)s",
     "%(items)s and one other": "%(items)s и ещё один",
     "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
-    "and one other...": "и ещё один...",
     "An error has occurred.": "Произошла ошибка.",
     "Attachment": "Вложение",
     "Ban": "Запретить",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 21bda3b741..549e06c991 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -150,8 +150,10 @@
     "%(items)s and %(remaining)s others": "%(items)s och %(remaining)s andra",
     "%(items)s and one other": "%(items)s och en annan",
     "%(items)s and %(lastItem)s": "%(items)s och %(lastItem)s",
-    "and %(overflowCount)s others...": "och %(overflowCount)s andra...",
-    "and one other...": "och en annan...",
+    "and %(count)s others...": {
+        "other": "och %(count)s andra...",
+        "one": "och en annan..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s och %(lastPerson)s skriver",
     "%(names)s and one other are typing": "%(names)s och en annan skriver",
     "%(names)s and %(count)s others are typing": "%(names)s och %(count)s andra skriver",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 5dff4816ee..265c3e1b58 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -98,8 +98,10 @@
     "%(items)s and %(remaining)s others": "%(items)s และอีก %(remaining)s ผู้ใช้",
     "%(items)s and one other": "%(items)s และอีกหนึ่งผู้ใช้",
     "%(items)s and %(lastItem)s": "%(items)s และ %(lastItem)s",
-    "and %(overflowCount)s others...": "และอีก %(overflowCount)s ผู้ใช้...",
-    "and one other...": "และอีกหนึ่งผู้ใช้...",
+    "and %(count)s others...": {
+        "other": "และอีก %(count)s ผู้ใช้...",
+        "one": "และอีกหนึ่งผู้ใช้..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s และ %(lastPerson)s กำลังพิมพ์",
     "%(names)s and one other are typing": "%(names)s และอีกหนึ่งคนกำลังพิมพ์",
     "%(names)s and %(count)s others are typing": "%(names)s และอีก %(count)s คนกำลังพิมพ์",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 3d0d774926..effc426464 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -156,8 +156,10 @@
     "%(items)s and %(remaining)s others": "%(items)s ve %(remaining)s diğerleri",
     "%(items)s and one other": "%(items)s ve bir başkası",
     "%(items)s and %(lastItem)s": "%(items)s ve %(lastItem)s",
-    "and %(overflowCount)s others...": "ve %(overflowCount)s diğerleri...",
-    "and one other...": "ve bir diğeri...",
+    "and %(count)s others...": {
+        "other": "ve %(count)s diğerleri...",
+        "one": "ve bir diğeri..."
+    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s ve %(lastPerson)s yazıyorlar",
     "%(names)s and one other are typing": "%(names)s ve birisi yazıyor",
     "%(names)s and %(count)s others are typing": "%(names)s ve %(count)s diğeri yazıyor",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 9fdc7a0b42..ad56ab45b8 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -239,8 +239,10 @@
     "%(items)s and %(remaining)s others": "%(items)s 和其它 %(remaining)s 个",
     "%(items)s and one other": "%(items)s 和其它一个",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
-    "and %(overflowCount)s others...": "和其它 %(overflowCount)s 个...",
-    "and one other...": "和其它一个...",
+    "and %(count)s others...": {
+        "other": "和其它 %(count)s 个...",
+        "one": "和其它一个..."
+    },
     "%(names)s and one other are typing": "%(names)s 和另一个人正在打字",
     "anyone": "任何人",
     "Anyone": "任何人",