diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
index 4275b7de7..11320f891 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
@@ -220,7 +220,7 @@ public class Notification implements Parcelable {
                         @Override
                         public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
                             final String targetedEmoji = ":" + emoji.getShortcode() + ":";
-                            if (displayNameSpan != null && displayNameSpan.toString().contains(targetedEmoji)) {
+                            if (displayNameSpan.toString().contains(targetedEmoji)) {
                                 //emojis can be used several times so we have to loop
                                 for (int startPosition = -1; (startPosition = displayNameSpan.toString().indexOf(targetedEmoji, startPosition + 1)) != -1; startPosition++) {
                                     final int endPosition = startPosition + targetedEmoji.length();
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 908a30bb1..b1408e214 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -4226,7 +4226,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {
                 try {
                     statuses.set(i, status);
-                    if( mRecyclerView != null) {
+                    statusListAdapter.notifyItemChanged(i);
+                    /*if( mRecyclerView != null) {
                         int finalI = i;
                         mRecyclerView.post(new Runnable() {
                             @Override
@@ -4234,9 +4235,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                 statusListAdapter.notifyItemChanged(finalI);
                             }
                         });
-                    }
-                } catch (Exception ignored) {
-                }
+                    }*/
+                } catch (Exception ignored) {}
                 break;
             }
         }
@@ -4250,7 +4250,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {
                 try {
                     statuses.set(i, status);
-                    if( mRecyclerView != null) {
+                    statusListAdapter.notifyItemChanged(i);
+                    /*if( mRecyclerView != null) {
                         int finalI = i;
                         mRecyclerView.post(new Runnable() {
                             @Override
@@ -4258,9 +4259,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                 statusListAdapter.notifyItemChanged(finalI);
                             }
                         });
-                    }
-                } catch (Exception ignored) {
-                }
+                    }*/
+                } catch (Exception ignored) {}
                 break;
             }
         }