diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 47b8e0a9f..97496bbf1 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -52,7 +52,9 @@
     private static java.lang.Object fromNative(com.sun.jna.FromNativeConverter, java.lang.Object, java.lang.reflect.Method);
 }
 
-# GSON parsing
+# JSON parsing
+-keep class com.vitorpamplona.quartz.crypto.** { *; }
+-keep class com.vitorpamplona.quartz.encoders.** { *; }
 -keep class com.vitorpamplona.quartz.events.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
 -keep class com.vitorpamplona.amethyst.service.** { *; }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/StringUtils.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt
similarity index 100%
rename from app/src/main/java/com/vitorpamplona/amethyst/service/StringUtils.kt
rename to app/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt
diff --git a/quartz/proguard-rules.pro b/quartz/proguard-rules.pro
index 0b483ce73..4727a86be 100644
--- a/quartz/proguard-rules.pro
+++ b/quartz/proguard-rules.pro
@@ -52,7 +52,9 @@
     private static java.lang.Object fromNative(com.sun.jna.FromNativeConverter, java.lang.Object, java.lang.reflect.Method);
 }
 
-# GSON parsing
+# JSON parsing
+-keep class com.vitorpamplona.quartz.crypto.** { *; }
+-keep class com.vitorpamplona.quartz.encoders.** { *; }
 -keep class com.vitorpamplona.quartz.events.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
 -keep class com.vitorpamplona.amethyst.service.** { *; }
\ No newline at end of file