diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java b/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java
index a4b444fa..6f9e2758 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java
@@ -69,9 +69,9 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
         StatusAdapter statusAdapter = ((StatusAdapter) parent.getAdapter());
         if (statusAdapter != null && statusAdapter.getItemCount() > position && position > 0) {
             Status status = statusAdapter.getItem(position);
-
+            int indentation = (status.isFocused?1:indentationMax);
             int start = (int) Helper.convertDpToPixel(
-                    6 * fontScale * CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, indentationMax),
+                    6 * fontScale * CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, indentation),
                     _mContext);
 
             if (parent.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR) {
@@ -95,7 +95,9 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
                 int indentation = Math.min(
                         CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, indentationMax),
                         indentationMax);
-
+                if(status.isFocused) {
+                    indentation = 1;
+                }
                 if (indentation > 0) {
                     Paint paint = new Paint();
                     paint.setDither(false);
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java
index d8b3d66c..944d0358 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java
@@ -214,7 +214,7 @@ public class FragmentMastodonContext extends Fragment {
         binding.recyclerView.setLayoutManager(mLayoutManager);
         binding.recyclerView.setAdapter(statusAdapter);
         binding.swipeContainer.setOnRefreshListener(() -> {
-            if (this.statuses.size() > 0 && !refresh) {
+            if (!this.statuses.isEmpty() && !refresh) {
                 binding.swipeContainer.setRefreshing(true);
                 pullToRefresh = true;
                 statusesVM.getContext(user_instance, user_token, focusedStatus.id)
@@ -277,7 +277,7 @@ public class FragmentMastodonContext extends Fragment {
             statusAdapter.notifyItemRangeRemoved(0, size);
             statuses.add(focusedStatus);
         }
-        if (context.ancestors.size() > 0) {
+        if (!context.ancestors.isEmpty()) {
             firstStatus = context.ancestors.get(0);
         } else {
             firstStatus = statuses.get(0);