diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
index 2cc27763..074b3c53 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
@@ -141,12 +141,15 @@ public class TweetAdapter extends Adapter<ViewHolder> {
      */
     @MainThread
     public void remove(long id) {
-        for (int pos = 0; pos < tweets.size(); pos++) {
+        for (int pos = tweets.size() - 1; pos >= 0; pos--) {
             Tweet tweet = tweets.get(pos);
-            if (tweet != null && tweet.getId() == id) {
-                tweets.remove(pos);
-                notifyItemRemoved(pos);
-                break;
+            if (tweet != null) {
+                Tweet embedded = tweet.getEmbeddedTweet();
+                // remove tweet and any retweet of it
+                if (tweet.getId() == id || (embedded != null && embedded.getId() == id)) {
+                    tweets.remove(pos);
+                    notifyItemRemoved(pos);
+                }
             }
         }
     }
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
index 620831e4..0bed68c5 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
@@ -120,13 +120,12 @@ public class UserAdapter extends Adapter<ViewHolder> {
     /**
      * remove user from adapter
      *
-     * @param screenname User to remove
+     * @param name screen name of the user to remove
      */
     @MainThread
-    public void removeUser(String screenname) {
-        int pos = data.removeItem(screenname);
+    public void removeUser(String name) {
+        int pos = data.removeItem(name);
         if (pos >= 0) {
-            data.remove(pos);
             notifyItemRemoved(pos);
         }
     }
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/utils/AppStyles.java b/app/src/main/java/org/nuclearfog/twidda/backend/utils/AppStyles.java
index e70cdffe..15befcea 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/utils/AppStyles.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/utils/AppStyles.java
@@ -46,7 +46,7 @@ import static jp.wasabeef.picasso.transformations.CropTransformation.GravityHori
 import static jp.wasabeef.picasso.transformations.CropTransformation.GravityVertical.TOP;
 
 /**
- * Class to set up all TetView preferences
+ * Theme class to set all view styles such as text or drawable color
  *
  * @author nuclearfog
  */