*/
gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* name,
gboolean* use_signature);
+
+gchar *modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *self, const gchar *recipient,
+ gboolean *use_signature);
+
+void modest_account_mgr_get_branding_from_recipient (ModestAccountMgr *mgr,
+ const gchar *current_recipient,
+ gchar **service_name,
+ const GdkPixbuf **service_icon,
+ guint64 icon_size);
+
+gboolean modest_account_mgr_account_is_multimailbox (ModestAccountMgr *mgr,
+ const gchar *account_name,
+ ModestProtocol **mmb_protocol);
/**
* modest_account_mgr_get_store_protocol:
* modest_account_mgr_get_from_string
* @self: a #ModestAccountMgr instance
* @name: the account name
+ * @mailbox: the mailbox
*
* get the From: string for some account; ie. "Foo Bar" <foo.bar@cuux.yy>"
*
* Returns: the newly allocated from-string, or NULL in case of error
*/
-gchar * modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name);
+gchar * modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name, const gchar *mailbox);
/**