-/* place for widget settings */
-#define MODEST_CONF_WIDGET_NAMESPACE MODEST_CONF_NAMESPACE "/widgets"
+#define MODEST_CONF_CONNECT_AT_STARTUP MODEST_CONF_NAMESPACE "/connect_at_startup"
+
+#define MODEST_CONF_SHOW_TOOLBAR MODEST_CONF_NAMESPACE "/show_toolbar"
+#define MODEST_CONF_SHOW_CC MODEST_CONF_NAMESPACE "/show_cc"
+#define MODEST_CONF_SHOW_BCC MODEST_CONF_NAMESPACE "/show_bcc"
+
+
+/*
+ * in the maemo case, we try to replace this
+ * with the device name
+ */
+#define MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME N_("Local folders")
+
+/* the name of the device; in case of maemo this is set and updated
+ * using dbus; see modest-maemo-utils.[ch]
+ */
+#define MODEST_CONF_DEVICE_NAME MODEST_CONF_NAMESPACE "/device_name"