- retval = g_strconcat (namespace, "/", accname, NULL);
+ retval = g_strconcat (namespace, "/", account_name, NULL);
+
+ /* special case: the key has some weird characters */
+ if (!modest_conf_key_is_valid (retval)) {
+
+ gchar *account_name_esc, *name_esc;
+ g_free (retval);
+
+ account_name_esc = account_name ? modest_conf_key_escape (account_name) : NULL;
+ name_esc = name ? modest_conf_key_escape (name) : NULL;
+
+ retval = get_account_keyname (account_name_esc, name_esc, server_account);