1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java b/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java
index 825ca3f17..00e82fd92 100644
--- a/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java
+++ b/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java
@@ -39,7 +39,10 @@ import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_TAKE
 public enum SendButtonAction {
     TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE, RECORD_VIDEO, CHOOSE_ATTACHMENT;
 
-    public static SendButtonAction valueOfOrDefault(String setting, SendButtonAction text) {
+    public static SendButtonAction valueOfOrDefault(final String setting) {
+        if (setting == null) {
+            return TEXT;
+        }
         try {
             return valueOf(setting);
         } catch (IllegalArgumentException e) {