diff --git a/app/build.gradle b/app/build.gradle
index c95776d95..e0b441b6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 307
-        versionName "2.16.0-beta-1"
+        versionCode 308
+        versionName "2.16.0"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
index b15a374ce..34e6db535 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
@@ -651,7 +651,7 @@ public class Status implements Parcelable{
             i++;
         }
         status.setImageURL(imgs);
-        content = content.replaceAll("(<\\s?p\\s?>)&gt;(((?!(<\\/p>)|(<br)).){5,})(<\\s?\\/p\\s?><\\s?p\\s?>|<\\s?br\\s?\\/?>)","<blockquote>$2</blockquote><p>");
+        content = content.replaceAll("(<\\s?p\\s?>)&gt;(((?!(<\\/p>)|(<br)).){5,})(<\\s?\\/p\\s?><\\s?p\\s?>|<\\s?br\\s?\\/?>|<\\s?\\/p\\s?>$)","<blockquote>$2</blockquote><p>");
         content = content.replaceAll("^<\\s?p\\s?>(.*)<\\s?\\/p\\s?>$","$1");
         spannableStringContent = new SpannableString(content);
         final int[] j = {0};
diff --git a/fastlane/metadata/android/en-US/changelogs/308.txt b/fastlane/metadata/android/en-US/changelogs/308.txt
new file mode 100644
index 000000000..db8a8f0a7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/308.txt
@@ -0,0 +1,12 @@
+Added
+- Select data to remove in database with the cache cleaner
+- Animated emojis in picker
+
+Changed
+- Easier feature for cropping media
+- Improve quotes
+
+Fixed
+- Potential crashes when switching between accounts
+- Autocomplete (Emoji+tag) removed a letter
+- Fix recent crashes
\ No newline at end of file