diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6cefa75cd..36576942c 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -146,7 +146,7 @@ android {
         buildConfigField "String", "STORE", "\"google\""
         multiDexEnabled true
 
-        versionCode 2030
+        versionCode 2035
         versionName "1.6"
     }
 
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
index 8f6c2c4dc..18cbfdc86 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -2,7 +2,7 @@
 <merge 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">
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/chatBarContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -11,9 +11,13 @@
         android:paddingRight="@dimen/spacing_medium">
 
         <LinearLayout
+            android:id="@+id/chatInputContainer"
             android:layout_width="match_parent"
             android:orientation="horizontal"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true">
 
             <ImageButton
                 android:id="@+id/emojiButton"
@@ -87,10 +91,13 @@
             android:layout_height="wrap_content"
             android:text="@string/read_community_guidelines"
             style="@style/Caption3"
-            android:textColor="@color/brand_300" />
+            android:textColor="@color/brand_300"
+            android:layout_above="@id/spacing"
+            android:layout_below="@id/chatInputContainer"/>
         <Space
             android:id="@+id/spacing"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"/>
+    </RelativeLayout>
 </merge>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java
index f0e96869e..c17ad1355 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java
@@ -47,7 +47,7 @@ public class RemoteConfigManager {
 
     public Integer maxChatLength() { return maxChatLength; }
 
-    public Boolean enableUsernameRelease() { return true; }
+    public Boolean enableUsernameRelease() { return enableUsernameRelease; }
 
     private void loadFromPreferences () {
         String storedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/owned/OwnedEquipment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/owned/OwnedEquipment.kt
new file mode 100644
index 000000000..c76f153bd
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/owned/OwnedEquipment.kt
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.models.inventory.owned
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class OwnedEquipment : RealmObject() {
+
+    @PrimaryKey
+    var combinedKey: String? = ""
+    var userID: String? = ""
+    var key: String? = ""
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
index 77e3eb1ff..402f66d67 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
@@ -26,6 +26,7 @@ public class Flags extends RealmObject {
     private boolean armoireEmpty;
     private boolean communityGuidelinesAccepted;
     private boolean verifiedUsername;
+    private boolean warnedLowHealth;
 
     public List<TutorialStep> getTutorial() {
         return tutorial;
@@ -138,4 +139,12 @@ public class Flags extends RealmObject {
     public void setVerifiedUsername(boolean verifiedUsername) {
         this.verifiedUsername = verifiedUsername;
     }
+
+    public boolean isWarnedLowHealth() {
+        return warnedLowHealth;
+    }
+
+    public void setWarnedLowHealth(boolean warnedLowHealth) {
+        this.warnedLowHealth = warnedLowHealth;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
index 360323f76..f1eebc3bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
@@ -128,7 +128,7 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
                     .delay(200, TimeUnit.MILLISECONDS)
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(Consumer {
-                recyclerView.scrollToPosition(0)
+                recyclerView?.scrollToPosition(0)
             }, RxErrorHandler.handleEmptyError())
             KeyboardUtil.dismissKeyboard(getActivity())
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
index 0b011ed09..31e2af0cc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
@@ -133,7 +133,7 @@ class ChatBarView : FrameLayout {
                 navBarAccountedHeightCalculated = true
 
                 val navbarHeight = NavbarUtils.getNavbarHeight(context)
-                spacing.updateLayoutParams<LinearLayout.LayoutParams> {
+                spacing.updateLayoutParams<RelativeLayout.LayoutParams> {
                     height = navbarHeight
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java
index 13b8c99ec..b67ca27a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java
@@ -88,10 +88,17 @@ public class MemberSerialization implements JsonDeserializer<Member> {
         if (obj.has("loginIncentives")) {
             member.setLoginIncentives(obj.get("loginIncentives").getAsInt());
         }
+
+        /*
+        TODO: Fix ownership storage
+        Right now ownership is a boolean field on the item/pet/mount/equipment itself.
+        Storing this data for the user can overwrite the ownership for the logged in user. The fix
+        is to properly store ownership of these things in a different object, similar to how the
+        iOS app handles it.
         if (obj.has("items")) {
             member.setItems(context.deserialize(obj.get("items"), Items.class));
         }
-
+        */
         member.setId(member.getId());
 
         realm.close();