2 files changed, 19 insertions, 1 deletions
diff --git a/libdino/src/entity/conversation.vala b/libdino/src/entity/conversation.vala
index 353daeae..4115ae83 100644
--- a/libdino/src/entity/conversation.vala
+++ b/libdino/src/entity/conversation.vala
@@ -33,7 +33,7 @@ public class Conversation : Object {
             }
         }
     }
-    public Encryption encryption { get; set; default = Encryption.NONE; }
+    public Encryption encryption { get; set; default = Encryption.UNKNOWN; }
     public Message? read_up_to { get; set; }
     public int read_up_to_item { get; set; default=-1; }
 
diff --git a/libdino/src/entity/settings.vala b/libdino/src/entity/settings.vala
index 0b09e9b9..be275efc 100644
--- a/libdino/src/entity/settings.vala
+++ b/libdino/src/entity/settings.vala
@@ -79,6 +79,24 @@ public class Settings : Object {
             check_spelling_ = value;
         }
     }
+
+    public Encryption get_default_encryption(Account account) {
+        string? setting = db.account_settings.get_value(account.id, "default-encryption");
+        if (setting != null) {
+            return (Encryption) int.parse(setting);
+        }
+        return Encryption.NONE;
+    }
+
+    public void set_default_encryption(Account account, Encryption encryption) {
+        db.account_settings.upsert()
+                .value(db.account_settings.key, "default-encryption", true)
+                .value(db.account_settings.account_id, account.id, true)
+                .value(db.account_settings.value, ((int)encryption).to_string())
+                .perform();
+
+
+    }
 }
 
 }