- pwd_caption = hildon_caption_new (size_group, _("mail_fi_password"),
- ppriv->pwd_entry, NULL,
- HILDON_CAPTION_OPTIONAL);
-
- ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX));
- port_caption = hildon_caption_new (size_group, _("mcen_fi_emailsetup_port"),
- ppriv->port_view, NULL,
- HILDON_CAPTION_OPTIONAL);
+ pwd_caption = modest_maemo_utils_create_captioned (title_size_group,
+ value_size_group,
+ _("mail_fi_password"),
+ FALSE,
+ ppriv->pwd_entry);
+
+ ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+ port_caption = modest_maemo_utils_create_captioned (title_size_group,
+ value_size_group,
+ _("mcen_fi_emailsetup_port"),
+ FALSE,
+ ppriv->port_view);