diff --git a/app/build.gradle b/app/build.gradle
index 52284b18..6714fc8c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "gr.thmmy.mthmmy"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 14
-        versionName "1.5.0"
+        versionCode 15
+        versionName "1.6.0"
         archivesBaseName = "mTHMMY-v$versionName"
         buildConfigField "String", "CURRENT_BRANCH", "\"" + getCurrentBranch() + "\""
         buildConfigField "String", "COMMIT_HASH", "\"" + getCommitHash() + "\""
diff --git a/app/gradle/grgit.gradle b/app/gradle/grgit.gradle
index d04a9a40..dc0d5e7f 100644
--- a/app/gradle/grgit.gradle
+++ b/app/gradle/grgit.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.ajoberstar.grgit:grgit-core:3.0.0-rc.2'
+        classpath 'org.ajoberstar.grgit:grgit-core:3.0.0'
     }
 }
 
diff --git a/app/src/main/assets/apache_libraries.html b/app/src/main/assets/apache_libraries.html
index cd224e39..b8a4c500 100644
--- a/app/src/main/assets/apache_libraries.html
+++ b/app/src/main/assets/apache_libraries.html
@@ -69,7 +69,7 @@
             <h5><a href="https://github.com/noties/Markwon">Markwon</a>&nbsp;v2.0.0 (Copyright ©2017 Dimitry Ivanov)</h5>
         </li>
         <li>
-            <h5><a href="https://github.com/ajoberstar/grgit">Grgit</a>&nbsp;v3.0.0-rc.2 (Copyright ©2018 Andrew Oberstar)</h5>
+            <h5><a href="https://github.com/ajoberstar/grgit">Grgit</a>&nbsp;v3.0.0 (Copyright ©2018 Andrew Oberstar)</h5>
         </li>
     </ul>
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index 6da2b530..849067f2 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -651,12 +651,11 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 if (reply.getContent() != null)
                     replyText += reply.getContent();
                 else {
-                    if (viewModel.getBuildedQuotes() != null && !viewModel.getBuildedQuotes().isEmpty())
-                        replyText += viewModel.getBuildedQuotes();
                     SharedPreferences drafts = context.getSharedPreferences(context.getString(R.string.pref_topic_drafts_key),
                             Context.MODE_PRIVATE);
                     replyText += drafts.getString(String.valueOf(viewModel.getTopicId()), "");
-
+                    if (viewModel.getBuildedQuotes() != null && !viewModel.getBuildedQuotes().isEmpty())
+                        replyText += viewModel.getBuildedQuotes();
                 }
                 holder.replyEditor.setText(replyText);
                 holder.replyEditor.getEditText().setSelection(holder.replyEditor.getText().length());
diff --git a/app/src/main/res/layout/activity_topic_edit_row.xml b/app/src/main/res/layout/activity_topic_edit_row.xml
index 5140d584..3c29ae33 100644
--- a/app/src/main/res/layout/activity_topic_edit_row.xml
+++ b/app/src/main/res/layout/activity_topic_edit_row.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_topic_quick_reply_row.xml b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
index 64e86895..6fc8a2d2 100644
--- a/app/src/main/res/layout/activity_topic_quick_reply_row.xml
+++ b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/build.gradle b/build.gradle
index 0a1a117a..f222f5bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:4.1.0'
         classpath 'io.fabric.tools:gradle:1.26.1'
-        classpath 'org.ajoberstar.grgit:grgit-core:3.0.0-rc.2'
+        classpath 'org.ajoberstar.grgit:grgit-core:3.0.0'
     }
 }