diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
index 5ea217813..0537c7717 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
@@ -861,10 +861,10 @@ public class Status implements Parcelable{
}
SpannableString spannableStringT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
- spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString().replaceAll("^
","").replaceAll("
","
").replaceAll("
",""), Html.FROM_HTML_MODE_LEGACY));
+ spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString(), Html.FROM_HTML_SEPARATOR_LINE_BREAK_PARAGRAPH));
else
//noinspection deprecation
- spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString().replaceAll("^","").replaceAll("
","
").replaceAll("
","")));
+ spannableStringT = new SpannableString(Html.fromHtml(spannableString.toString()));
URLSpan[] spans = spannableStringT.getSpans(0, spannableStringT.length(), URLSpan.class);
for (URLSpan span : spans) {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 572dcdb5e..334037b8e 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -1891,10 +1891,10 @@ public class Helper {
accountsMentionUnknown.add(account);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
- spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString().replaceAll("^","").replaceAll("
","
").replaceAll("
",""), Html.FROM_HTML_MODE_LEGACY));
+ spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString(), Html.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL));
else
//noinspection deprecation
- spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString().replaceAll("^","").replaceAll("
","
").replaceAll("
","")));
+ spannableString = new SpannableString(Html.fromHtml(spannableStringT.toString()));
URLSpan[] urls = spannableString.getSpans(0, spannableString.length(), URLSpan.class);
for(URLSpan span : urls)
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 9714845bb..1c8af5631 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -265,11 +265,9 @@