+#define MODEST_SERVER_ACCOUNT_SUBNAMESPACE "/server_accounts"
+#define MODEST_SERVER_ACCOUNT_NAMESPACE (modest_defs_namespace (MODEST_SERVER_ACCOUNT_SUBNAMESPACE))
+
+/* show toolbar settings */
+#define MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR \
+ (modest_defs_namespace (MODEST_CONF_WIDGET_SUBNAMESPACE "/" \
+ MODEST_CONF_MAIN_WINDOW_KEY "/show_toolbar"))
+#define MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR \
+ (modest_defs_namespace (MODEST_CONF_WIDGET_SUBNAMESPACE "/" \
+ MODEST_CONF_EDIT_WINDOW_KEY "/show_toolbar"))
+#define MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR \
+ (modest_defs_namespace (MODEST_CONF_WIDGET_SUBNAMESPACE "/" \
+ MODEST_CONF_MSG_VIEW_WINDOW_KEY "/show_toolbar"))
+#define MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN \
+ (modest_defs_namespace (MODEST_CONF_WIDGET_SUBNAMESPACE "/" \
+ MODEST_CONF_MAIN_WINDOW_KEY "/show_toolbar_fullscreen"))
+#define MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN \
+ (modest_defs_namespace (MODEST_CONF_WIDGET_SUBNAMESPACE "/" \
+ MODEST_CONF_EDIT_WINDOW_KEY "/show_toolbar_fullscreen"))
+#define MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN \
+ (modest_defs_namespace (MODEST_CONF_WIDGET_SUBNAMESPACE "/" \
+ MODEST_CONF_MSG_VIEW_WINDOW_KEY "/show_toolbar_fullscreen"))