diff --git a/app/build.gradle b/app/build.gradle
index dd291abc..fe41099b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 34
-        versionCode 538
-        versionName "3.34.1"
+        versionCode 539
+        versionName "3.35.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index d56735b9..4c992e7a 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.35.0",
+    "code": "539",
+    "note": "Added:\n- Full Mastodon quotes support\n- Quote button can be hidden in Settings > Timeline\n- Change default quote policy in settings\n- Add colors in compose depending of the visibility (can be disabled/colors can be changed)\n- Add accessibility actions to move timelines up/down in Manage timelines page\n\nChanged:\n- Boost & quote buttons are merged (can be disabled in settings)\n- Show emoji buttons only in focused status\n- Add popup menu for boost/quote actions in status\n- Improve UI and accessibility in login page\n- Move \"Max chars in links\" next to \"Truncate links\"\n- Add more translated pronouns for keys support\n- When focused, information about a message are displayed on 2 lines\n\nFixed:\n- Left margin not removed for bottom information\n- Make content warning text selectable\n- Disable HTML parsing in display names\n- Improve translate button preference\n- Fix some crashes"
+  },
   {
     "version": "3.34.1",
     "code": "538",
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
index 3a5a41ec..03a627a3 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
@@ -37,6 +37,7 @@ import android.text.TextPaint;
 import android.text.style.ClickableSpan;
 import android.text.style.QuoteSpan;
 import android.text.style.URLSpan;
+import android.util.Log;
 import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -187,8 +188,10 @@ public class SpannableHelper {
         if(!markdownSupport) {
             text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?/?>)&gt;(((?!(<\\s?br\\s?/?>|<\\s?/s?p\\s?>)).)*))", "$2<blockquote>$3</blockquote>");
         }
-        text = text.trim().replaceAll("\\s{3}", "&nbsp;&nbsp;&nbsp;");
-        text = text.trim().replaceAll("\\s{2}", "&nbsp;&nbsp;");
+        if(convertHtml) {
+            text = text.trim().replaceAll("\\s{3}", "&nbsp;&nbsp;&nbsp;");
+            text = text.trim().replaceAll("\\s{2}", "&nbsp;&nbsp;");
+        }
         SpannableString initialContent;
         if (convertHtml) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
@@ -1014,7 +1017,9 @@ public class SpannableHelper {
         if (text == null) {
             return null;
         }
-
+        Log.v(Helper.TAG,"text1 : " + text);
+        text = text.replaceAll("&nbsp"," ");
+        Log.v(Helper.TAG,"text2 : " + text);
         SpannableString initialContent = new SpannableString(text);
 
         SpannableStringBuilder content = new SpannableStringBuilder(initialContent);
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt
index 131bc74a..ef59dae1 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt
@@ -2,19 +2,21 @@ Added:
 - Full Mastodon quotes support
 - Quote button can be hidden in Settings > Timeline
 - Change default quote policy in settings
-- Add colors in compose depending of the visibility (can be disabled / colors can be changed)
+- Add colors in compose depending of the visibility (can be disabled/colors can be changed)
 - Add accessibility actions to move timelines up/down in Manage timelines page
 
 Changed:
-- Boost & quote buttons are merged
+- Boost & quote buttons are merged (can be disabled in settings)
 - Show emoji buttons only in focused status
 - Add popup menu for boost/quote actions in status
 - Improve UI and accessibility in login page
 - Move "Max chars in links" next to "Truncate links"
 - Add more translated pronouns for keys support
+- When focused, information about a message are displayed on 2 lines
 
 Fixed:
 - Left margin not removed for bottom information
 - Make content warning text selectable
 - Disable HTML parsing in display names
-- Improve translate button preference
\ No newline at end of file
+- Improve translate button preference
+- Fix some crashes
\ No newline at end of file