-/* typical parameter-less _new function */
-/* if this is a kind of GtkWidget, it should probably return at GtkWidget*, */
-/* otherwise probably a GObject*. */
-GtkWidget* modest_viewer_window_new (ModestUI *ui);
-
-/* fill in other public functions, eg.: */
-/* void modest_viewer_window_do_something (ModestViewerWindow *self, const gchar* param); */
-/* gboolean modest_viewer_window_has_foo (ModestViewerWindow *self, gint value); */
+GtkWidget* modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg);
+
+/**
+ * modest_viewer_window_get_data:
+ * @viewer_win: a ModestViewerWindow instance
+ *
+ * Retrieves the data pointer that was set at creation of this instance
+ *
+ * Returns: the data pointer
+ */
+gpointer modest_viewer_window_get_data(ModestViewerWindow *viewer_win);
+
+/**
+ * modest_viewer_window_get_tiny_msg_view:
+ * @viewer_win: a ModestViewerWindow instance
+ *
+ * Returns: the ModestTnyMsgView widget from the viewer instance
+ */
+ModestTnyMsgView *modest_viewer_window_get_tiny_msg_view(ModestViewerWindow *viewer_win);