- if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr (), account_name,
- MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
- signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name,
- MODEST_ACCOUNT_SIGNATURE, FALSE);
+ gboolean use_signature = FALSE;
+ signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr (), account_name, &use_signature);
+
+ if (use_signature) {