diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
index 7ba434182..f2410b375 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
@@ -39,6 +39,11 @@ open class SubscriptionPlan : RealmObject(), BaseObject {
             return customerId != null && (dateTerminated == null || dateTerminated!!.after(today) || active == true)
         }
 
+    val totalNumberOfGemsAlways: Int
+        get() {
+            return 24 + (consecutive?.gemCapExtra ?: 0)
+        }
+
     val totalNumberOfGems: Int
         get() {
             if (!isActive) return 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt
index f3c52df69..25e6aea4c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt
@@ -209,7 +209,7 @@ open class SubscriptionBottomSheetFragment : BottomSheetDialogFragment() {
         if (user != null) {
             binding.content.loadingIndicator.visibility = View.GONE
             binding.content.subscription12month.showHourglassPromo(user?.purchased?.plan?.isEligableForHourglassPromo == true)
-            val totalGemCap = user?.purchased?.plan?.totalNumberOfGems ?: 24
+            val totalGemCap = user?.purchased?.plan?.totalNumberOfGemsAlways ?: 24
             binding.content.subscription1month.gemCap = totalGemCap
             binding.content.subscription3month.gemCap = totalGemCap
             binding.content.subscription6month.gemCap = totalGemCap
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index f585f4331..76b0dd3fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -294,7 +294,7 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
                 binding?.content?.giftSegmentUnsubscribed?.root?.visibility = View.VISIBLE
                 binding?.content?.subscriptionDisclaimerView?.visibility = View.VISIBLE
 
-                val totalGemCap = user?.purchased?.plan?.totalNumberOfGems ?: 24
+                val totalGemCap = user?.purchased?.plan?.totalNumberOfGemsAlways ?: 24
                 binding?.content?.subscription1month?.gemCap = totalGemCap
                 binding?.content?.subscription3month?.gemCap = totalGemCap
                 binding?.content?.subscription6month?.gemCap = totalGemCap
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
index 15a493674..44635cb9b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
@@ -147,11 +147,11 @@ class SubscriptionDetailsView : LinearLayout {
         if (plan.isActive && (terminatedLocalDate == null || nextHourglassDate.isBefore(terminatedLocalDate))) {
             val format =
                 if (now.year != nextHourglassDate.year) {
-                    "MMM yyyy"
+                    "MMMM yyyy"
                 } else {
-                    "MMMM"
+                    "LLLL"
                 }
-            val nextHourglassMonth = nextHourglassDate.format(DateTimeFormatter.ofPattern(format))
+            val nextHourglassMonth = DateTimeFormatter.ofPattern(format).format(nextHourglassDate)
             nextHourglassMonth?.let { binding.nextHourglassTextview.text = it }
             binding.resubscribeForHourglassesLabel.visibility = View.GONE
         } else {
diff --git a/version.properties b/version.properties
index 69df22c52..004f6f00c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-NAME=4.6.0
-CODE=9331
\ No newline at end of file
+NAME=4.6.1
+CODE=12041
\ No newline at end of file