+#ifdef MODEST_TOOLKIT_HILDON2
+#define MODEST_MARGIN_HALF HILDON_MARGIN_HALF
+#define MODEST_MARGIN_DEFAULT HILDON_MARGIN_DEFAULT
+#define MODEST_MARGIN_DOUBLE HILDON_MARGIN_DOUBLE
+#define MODEST_MARGIN_TRIPLE HILDON_MARGIN_TRIPLE
+#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 320
+#define MODEST_EDITABLE_SIZE (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH)
+#else
+#define MODEST_MARGIN_HALF 3
+#define MODEST_MARGIN_DEFAULT 6
+#define MODEST_MARGIN_DOUBLE 12
+#define MODEST_MARGIN_TRIPLE 18
+#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394
+#endif