-/* fill in other public functions, eg.: */
-/* void modest_editor_window_do_something (ModestEditorWindow *self, const gchar* param); */
-/* gboolean modest_editor_window_has_foo (ModestEditorWindow *self, gint value); */
-
-gboolean modest_editor_window_set_to_header(ModestEditorWindow *edit_win, gchar *to);
-
-gboolean modest_editor_window_set_cc_header(ModestEditorWindow *edit_win, gchar *to);
-
-gboolean modest_editor_window_set_bcc_header(ModestEditorWindow *edit_win, gchar *to);
-
-gboolean modest_editor_window_set_subject_header(ModestEditorWindow *edit_win, gchar *to);
-
-gboolean modest_editor_window_set_body(ModestEditorWindow *edit_win, gchar *to);
-
+/**
+ * modest_editor_window_set_to_header:
+ * @edit_win: a ModestEditorWindow instance
+ * @to: The "To:" header string for this editor instance
+ *
+ * Sets the "To:" header to the string *to
+ *
+ * Returns: TRUE on success, FALSE otherwise
+ */
+gboolean modest_editor_window_set_to_header(ModestEditorWindow *edit_win, const gchar *to);
+
+/**
+ * modest_editor_window_set_cc_header:
+ * @edit_win: a ModestEditorWindow instance
+ * @cc: The "CC:" header string for this editor instance
+ *
+ * Sets the "CC:" header to the string *cc
+ *
+ * Returns: TRUE on success, FALSE otherwise
+ */
+gboolean modest_editor_window_set_cc_header(ModestEditorWindow *edit_win, const gchar *cc);
+
+/**
+ * modest_editor_window_set_bcc_header:
+ * @edit_win: a ModestEditorWindow instance
+ * @bcc: The "BCC:" header string for this editor instance
+ *
+ * Sets the "BCC:" header to the string *bcc
+ *
+ * Returns: TRUE on success, FALSE otherwise
+ */
+gboolean modest_editor_window_set_bcc_header(ModestEditorWindow *edit_win, const gchar *bcc);
+
+/**
+ * modest_editor_window_set_subject_header:
+ * @edit_win: a ModestEditorWindow instance
+ * @subject: The "Subject:" header string for this editor instance
+ *
+ * Sets the "Subject:" header to the string *subject
+ *
+ * Returns: TRUE on success, FALSE otherwise
+ */
+gboolean modest_editor_window_set_subject_header(ModestEditorWindow *edit_win, const gchar *subject);
+
+/**
+ * modest_editor_window_set_body:
+ * @edit_win: a ModestEditorWindow instance
+ * @body: The message body string for this editor instance
+ *
+ * Sets the message body to the string *body
+ *
+ * Returns: TRUE on success, FALSE otherwise
+ */
+gboolean modest_editor_window_set_body(ModestEditorWindow *edit_win, const gchar *body);
+
+/**
+ * modest_editor_window_attach_file:
+ * @edit_win: a ModestEditorWindow instance
+ * @filename: The name of the file to attach
+ *
+ * Attaches the file "filename" to the message contents
+ *
+ * Returns: TRUE on success, FALSE otherwise
+ */
+gboolean modest_editor_window_attach_file(ModestEditorWindow *edit_win, ModestTnyAttachment *attachment);
+
+/**
+ * modest_editor_window_set_attachments:
+ * @edit_win: a ModestEditorWindow instance
+ * @attachments: a list of attachments
+ *
+ * Frees the current attachments, then sets the list of attachments to *attachments
+ *
+ * Returns: The new GList* of attachments.
+ */
+GList * modest_editor_window_set_attachments(ModestEditorWindow *edit_win, const GList* attachments);
+
+/**
+ * modest_editor_window_get_attachments:
+ * @edit_win: a ModestEditorWindow instance
+ *
+ * Gets the GList* of attachments of this instance
+ *
+ * Returns: The GList* of attachments of this instance
+ */
+GList * modest_editor_window_get_attachments(ModestEditorWindow *edit_win);
+
+void modest_editor_window_set_identity(ModestEditorWindow *edit_win, const gchar *identity);
+const gchar * modest_editor_window_get_identity(ModestEditorWindow *edit_win);
+
+void modest_editor_window_set_transport(ModestEditorWindow *edit_win, const gchar *transport);
+const gchar * modest_editor_window_get_transport(ModestEditorWindow *edit_win);