diff --git a/src/client/accounts/add-edit-page.vala b/src/client/accounts/add-edit-page.vala
index e4da0a6..cf7e09b 100644
--- a/src/client/accounts/add-edit-page.vala
+++ b/src/client/accounts/add-edit-page.vala
@@ -382,6 +382,7 @@ public class AddEditPage : Gtk.Box {
         use_email_signature = initial_use_email_signature;
         email_signature = initial_email_signature;
 
+
         
         // Set defaults for IMAP info
         imap_host = initial_default_imap_host ?? "";
diff --git a/src/engine/api/geary-account-information.vala b/src/engine/api/geary-account-information.vala
index 4f25867..3849150 100644
--- a/src/engine/api/geary-account-information.vala
+++ b/src/engine/api/geary-account-information.vala
@@ -135,7 +135,7 @@ public class Geary.AccountInformation : BaseObject {
             save_sent_mail = get_bool_value(key_file, GROUP, SAVE_SENT_MAIL_KEY, true);
             ordinal = get_int_value(key_file, GROUP, ORDINAL_KEY, default_ordinal++);
             use_email_signature = get_bool_value(key_file, GROUP, USE_EMAIL_SIGNATURE_KEY);
-            email_signature = get_string_value(key_file, GROUP, EMAIL_SIGNATURE_KEY);
+            email_signature = get_escaped_string(key_file, GROUP, EMAIL_SIGNATURE_KEY);
 
 
             if (ordinal >= default_ordinal)
@@ -517,6 +517,16 @@ public class Geary.AccountInformation : BaseObject {
         
         return def;
     }
+
+    private string get_escaped_string(KeyFile key_file, string group, string key, string def = "") {
+        try {
+            return key_file.get_string(group, key);
+        } catch (KeyFileError err) {
+            //ignore
+        }
+
+        return def;
+    }
     
     private Gee.List<string> get_string_list_value(KeyFile key_file, string group, string key) {
         try {
@@ -591,7 +601,7 @@ public class Geary.AccountInformation : BaseObject {
         key_file.set_integer(GROUP, PREFETCH_PERIOD_DAYS_KEY, prefetch_period_days);
         key_file.set_boolean(GROUP, SAVE_SENT_MAIL_KEY, save_sent_mail);
         key_file.set_boolean(GROUP, USE_EMAIL_SIGNATURE_KEY, use_email_signature);
-        key_file.set_value(GROUP, EMAIL_SIGNATURE_KEY, email_signature);
+        key_file.set_string(GROUP, EMAIL_SIGNATURE_KEY, email_signature);
         
         if (service_provider == ServiceProvider.OTHER) {
             key_file.set_value(GROUP, IMAP_HOST, default_imap_server_host);
