1 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
index 108634f67..b5abedd87 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
@@ -680,7 +680,10 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             MathJaxView mathview = new MathJaxView(context, mathJaxConfig);
             holder.binding.statusContentMaths.addView(mathview);
             if (status.contentSpan != null) {
-                mathview.setInputText(status.contentSpan.toString());
+                String input = status.contentSpan.toString();
+                input = input.replaceAll("'", "&#39;");
+                input = input.replaceAll("\"", "&#34;");
+                mathview.setInputText(input);
             } else {
                 status.mathsShown = false;
                 holder.binding.statusContentMaths.setVisibility(View.GONE);
@@ -841,7 +844,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 }
             });
             holder.binding.actionButtonFavorite.setChecked(statusToDeal.favourited);
-            holder.binding.statusUserInfo.setOnClickListener(v -> {
+            holder.binding.avatar.setOnClickListener(v -> {
                 if (remote) {
                     Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();
                     searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)
@@ -1657,6 +1660,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         });
         if (!minified && canBeFederated) {
             holder.binding.mainContainer.setOnClickListener(v -> holder.binding.statusContent.callOnClick());
+            holder.binding.statusUserInfo.setOnClickListener(v -> {
+                holder.binding.statusContent.callOnClick();
+            });
             holder.binding.statusContent.setOnClickListener(v -> {
                 if (status.isFocused || v.getTag() == SpannableHelper.CLICKABLE_SPAN) {
                     if (v.getTag() == SpannableHelper.CLICKABLE_SPAN) {