+ //g_warning ("%s: %s", __FUNCTION__, active_account);
+
+ /* only 'real' account should be set here; for example the email signature
+ * depends on the current account, so if you reply to a message in your
+ * archive, it should take the signature from the real active account,
+ * not the non-existing one from your mmc-pseudo-account
+ */
+ if (active_account && ((strcmp (active_account, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0) ||
+ (strcmp (active_account, MODEST_MMC_ACCOUNT_ID) == 0))) {
+ g_warning ("%s: %s is not a valid active account",
+ __FUNCTION__, active_account);
+ return;
+ }
+