diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
index 55a9f4ba..fd14626d 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
@@ -643,10 +643,13 @@ public class Mastodon implements Connection {
 	public Statuses getStatusReplies(long id, long minId, long maxId) throws MastodonException {
 		Statuses statusThreads = getStatuses(ENDPOINT_STATUS + id + "/context", new ArrayList<>(0), minId, maxId);
 		Statuses result = new Statuses();
+		// todo add option to toggle viewing whole thread
 		for (Status status : statusThreads) {
-			// Mastodon doesn't support min/max ID.
-			if (status.getRepliedStatusId() == id && (minId == 0L || status.getId() > minId) && (maxId == 0L || status.getId() < maxId)) {
+			if (status != null && (minId == 0L || status.getId() > minId) && (maxId == 0L || status.getId() < maxId)) {
 				result.add(status);
+				if (result.size() == settings.getListSize()) {
+					break;
+				}
 			}
 		}
 		return result;
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 332685b9..5d4bd7a7 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -170,7 +170,6 @@
 	<string name="error_cant_reply_to_status">Status ist nicht für Antworten freigegeben!</string>
 	<string name="error_corrupt_api_key">Fehler, API Schlüssel ist fehlerhaft!</string>
 	<string name="error_acc_update">Account Informationen konnten nicht aktualisiert werden! Bitte Eingaben überprüfen.</string>
-	<string name="error_translating_status">Post konnte nicht übersetzt werden</string>
 	<string name="settings_color_card">Kartenfarbe</string>
 	<string name="settings_icon_color">Symbolfarbe</string>
 	<string name="settings_key1_hint">Consumer Key</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 632ef53b..1633bff1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -98,7 +98,6 @@
 	<string name="error_forbidden_api_access">¡La API no soporta esta operación!</string>
 	<string name="error_adding_media">¡Ocurrió un error al agregar los medios!</string>
 	<string name="error_media_init">¡Error al preparar los archivos de medios para su carga!</string>
-	<string name="error_translating_status">No se pudo traducir el estado</string>
 	<string name="error_empty_text">¡El texto está vacío!</string>
 
 	<!-- menu icon strings -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec6917b6..05da3678 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,7 +126,6 @@
 	<string name="error_api_error">API error</string>
 	<string name="error_adding_media">Error occurred while adding media!</string>
 	<string name="error_media_init">Error while preparing media files for upload!</string>
-	<string name="error_translating_status">Could not translate status</string>
 	<string name="error_empty_filter_title">Filter description must not be empty</string>
 	<string name="error_empty_filter_selection">It must be at least one filter enabled</string>
 	<string name="error_empty_text">Empty text!</string>