X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=docs%2Freference%2Fmodest-sections.txt;h=b2514de54fd8ce578032f8a8ea7ba09f6e7dde3f;hb=adac94902c290224a653eafac2648e49867e04f6;hp=b997871b184435416f23d76e7820db553aba0e56;hpb=d5bee34a102dfc92754e669bf930a290d69586be;p=modest

diff --git a/docs/reference/modest-sections.txt b/docs/reference/modest-sections.txt
index b997871..b2514de 100644
--- a/docs/reference/modest-sections.txt
+++ b/docs/reference/modest-sections.txt
@@ -1,60 +1,15 @@
 <SECTION>
-<FILE>modest-tny-attachment</FILE>
-<TITLE>ModestTnyAttachment</TITLE>
-ModestTnyAttachment
-modest_tny_attachment_new
-modest_tny_attachment_set_name
-modest_tny_attachment_get_name
-modest_tny_attachment_set_filename
-modest_tny_attachment_get_filename
-modest_tny_attachment_set_mime_type
-modest_tny_attachment_get_mime_type
-modest_tny_attachment_guess_mime_type
-modest_tny_attachment_get_stream
-modest_tny_attachment_free_list
-<SUBSECTION Standard>
-MODEST_TNY_ATTACHMENT
-MODEST_IS_TNY_ATTACHMENT
-MODEST_TYPE_TNY_ATTACHMENT
-modest_tny_attachment_get_type
-MODEST_TNY_ATTACHMENT_CLASS
-MODEST_IS_TNY_ATTACHMENT_CLASS
-MODEST_TNY_ATTACHMENT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-ui</FILE>
-<TITLE>ModestUI</TITLE>
-ModestUI
-modest_ui_new
-modest_ui_main_window
-<SUBSECTION Standard>
-MODEST_UI
-MODEST_IS_UI
-MODEST_TYPE_UI
-modest_ui_get_type
-MODEST_UI_CLASS
-MODEST_IS_UI_CLASS
-MODEST_UI_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-account-mgr</FILE>
 <TITLE>ModestAccountMgr</TITLE>
 ModestAccountMgr
-ModestServerAccountData
-ModestAccountData
 modest_account_mgr_new
 modest_account_mgr_add_account
 modest_account_mgr_add_server_account
+modest_account_mgr_add_server_account_uri
 modest_account_mgr_remove_account
 modest_account_mgr_account_names
 modest_account_mgr_search_server_accounts
 modest_account_mgr_account_exists
-modest_account_mgr_get_account_data
-modest_account_mgr_free_account_data
-modest_account_mgr_account_set_enabled
-modest_account_mgr_account_get_enabled
 modest_account_mgr_get_string
 modest_account_mgr_get_int
 modest_account_mgr_get_bool
@@ -75,39 +30,6 @@ MODEST_ACCOUNT_MGR_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-protocol-mgr</FILE>
-<TITLE>ModestProtocolMgr</TITLE>
-ModestProtocolMgr
-MODEST_PROTOCOL_TRANSPORT_SENDMAIL
-MODEST_PROTOCOL_TRANSPORT_SMTP
-MODEST_PROTOCOL_STORE_NONE
-MODEST_PROTOCOL_STORE_POP
-MODEST_PROTOCOL_STORE_IMAP
-MODEST_PROTOCOL_STORE_MAILDIR
-MODEST_PROTOCOL_STORE_MBOX
-MODEST_PROTOCOL_SECURITY_NONE
-MODEST_PROTOCOL_SECURITY_SSL
-MODEST_PROTOCOL_SECURITY_TLS
-MODEST_PROTOCOL_AUTH_NONE
-MODEST_PROTOCOL_AUTH_PASSWORD
-ModestProtocolType
-modest_protocol_mgr_new
-modest_protocol_mgr_get_transport_protocols
-modest_protocol_mgr_get_store_protocols
-modest_protocol_mgr_get_security_protocols
-modest_protocol_mgr_get_auth_protocols
-modest_protocol_mgr_protocol_is_valid
-<SUBSECTION Standard>
-MODEST_PROTOCOL_MGR
-MODEST_IS_PROTOCOL_MGR
-MODEST_TYPE_PROTOCOL_MGR
-modest_protocol_mgr_get_type
-MODEST_PROTOCOL_MGR_CLASS
-MODEST_IS_PROTOCOL_MGR_CLASS
-MODEST_PROTOCOL_MGR_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-conf</FILE>
 ModestConfValueType
 ModestConfEvent
@@ -139,13 +61,29 @@ MODEST_CONF_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-formatter</FILE>
+<TITLE>ModestFormatter</TITLE>
+ModestFormatter
+modest_formatter_new
+modest_formatter_cite
+modest_formatter_quote
+modest_formatter_inline
+modest_formatter_attach
+<SUBSECTION Standard>
+MODEST_FORMATTER
+MODEST_IS_FORMATTER
+MODEST_TYPE_FORMATTER
+modest_formatter_get_type
+MODEST_FORMATTER_CLASS
+MODEST_IS_FORMATTER_CLASS
+MODEST_FORMATTER_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-tny-platform-factory</FILE>
 <TITLE>ModestTnyPlatformFactory</TITLE>
 ModestTnyPlatformFactory
 modest_tny_platform_factory_get_instance
-modest_tny_platform_factory_get_modest_account_mgr_instance
-modest_tny_platform_factory_get_modest_conf_instance
-modest_tny_platform_factory_get_modest_mail_operation_queue_instance
 <SUBSECTION Standard>
 MODEST_TNY_PLATFORM_FACTORY
 MODEST_IS_TNY_PLATFORM_FACTORY
@@ -176,40 +114,6 @@ MODEST_MAIL_OPERATION_QUEUE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-formatter</FILE>
-<TITLE>ModestFormatter</TITLE>
-ModestFormatter
-modest_formatter_new
-modest_formatter_cite
-modest_formatter_quote
-modest_formatter_inline
-modest_formatter_attach
-<SUBSECTION Standard>
-MODEST_FORMATTER
-MODEST_IS_FORMATTER
-MODEST_TYPE_FORMATTER
-modest_formatter_get_type
-MODEST_FORMATTER_CLASS
-MODEST_IS_FORMATTER_CLASS
-MODEST_FORMATTER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-tny-stream-gtkhtml</FILE>
-<TITLE>ModestTnyStreamGtkhtml</TITLE>
-ModestTnyStreamGtkhtml
-modest_tny_stream_gtkhtml_new
-<SUBSECTION Standard>
-MODEST_TNY_STREAM_GTKHTML
-MODEST_IS_TNY_STREAM_GTKHTML
-MODEST_TYPE_TNY_STREAM_GTKHTML
-modest_tny_stream_gtkhtml_get_type
-MODEST_TNY_STREAM_GTKHTML_CLASS
-MODEST_IS_TNY_STREAM_GTKHTML_CLASS
-MODEST_TNY_STREAM_GTKHTML_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-mail-operation</FILE>
 ModestMailOperationForwardType
 ModestMailOperationReplyType
@@ -248,38 +152,13 @@ MODEST_MAIL_OPERATION_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-widget-factory</FILE>
-<TITLE>ModestWidgetFactory</TITLE>
-ModestWidgetFactory
-ModestComboBoxType
-modest_widget_factory_new
-modest_widget_factory_get_folder_view
-modest_widget_factory_get_header_view
-modest_widget_factory_get_msg_preview
-modest_widget_factory_get_account_view
-modest_widget_factory_get_progress_bar
-modest_widget_factory_get_status_bar
-modest_widget_factory_get_combo_box
-modest_widget_factory_get_online_toggle
-modest_widget_factory_get_folder_info_label
-modest_widget_factory_get_main_toolbar
-modest_widget_factory_get_edit_toolbar
-<SUBSECTION Standard>
-MODEST_WIDGET_FACTORY
-MODEST_IS_WIDGET_FACTORY
-MODEST_TYPE_WIDGET_FACTORY
-modest_widget_factory_get_type
-MODEST_WIDGET_FACTORY_CLASS
-MODEST_IS_WIDGET_FACTORY_CLASS
-MODEST_WIDGET_FACTORY_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-tny-account-store</FILE>
 ModestTnyGetPassFunc
 <TITLE>ModestTnyAccountStore</TITLE>
 ModestTnyAccountStore
 modest_tny_account_store_new
+modest_tny_account_store_get_tny_account_by_id
+modest_tny_account_store_get_tny_account_by_account
 tny_account_store_get_session
 <SUBSECTION Standard>
 MODEST_TNY_ACCOUNT_STORE
@@ -292,6 +171,61 @@ MODEST_TNY_ACCOUNT_STORE_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-cache-mgr</FILE>
+<TITLE>ModestCacheMgr</TITLE>
+ModestCacheMgr
+ModestCacheMgrCacheType
+modest_cache_mgr_new
+modest_cache_mgr_get_cache
+modest_cache_mgr_flush
+modest_cache_mgr_flush_all
+modest_cache_mgr_get_size
+<SUBSECTION Standard>
+MODEST_CACHE_MGR
+MODEST_IS_CACHE_MGR
+MODEST_TYPE_CACHE_MGR
+modest_cache_mgr_get_type
+MODEST_CACHE_MGR_CLASS
+MODEST_IS_CACHE_MGR_CLASS
+MODEST_CACHE_MGR_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-send-queue</FILE>
+<TITLE>ModestTnySendQueue</TITLE>
+ModestTnySendQueue
+modest_tny_send_queue_new
+<SUBSECTION Standard>
+MODEST_TNY_SEND_QUEUE
+MODEST_IS_TNY_SEND_QUEUE
+MODEST_TYPE_TNY_SEND_QUEUE
+modest_tny_send_queue_get_type
+MODEST_TNY_SEND_QUEUE_CLASS
+MODEST_IS_TNY_SEND_QUEUE_CLASS
+MODEST_TNY_SEND_QUEUE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-singletons</FILE>
+<TITLE>ModestSingletons</TITLE>
+ModestSingletons
+modest_singletons_new
+modest_singletons_get_conf
+modest_singletons_get_account_mgr
+modest_singletons_get_account_store
+modest_singletons_get_cache_mgr
+modest_singletons_get_mail_operation_queue
+<SUBSECTION Standard>
+MODEST_SINGLETONS
+MODEST_IS_SINGLETONS
+MODEST_TYPE_SINGLETONS
+modest_singletons_get_type
+MODEST_SINGLETONS_CLASS
+MODEST_IS_SINGLETONS_CLASS
+MODEST_SINGLETONS_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-account-assistant</FILE>
 <TITLE>ModestAccountAssistant</TITLE>
 ModestAccountAssistant
@@ -322,25 +256,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -349,6 +264,7 @@ modest_store_widget_get_remember_password
 modest_store_widget_get_username
 modest_store_widget_get_servername
 modest_store_widget_get_proto
+modest_store_widget_get_path
 <SUBSECTION Standard>
 MODEST_STORE_WIDGET
 MODEST_IS_STORE_WIDGET
@@ -360,35 +276,23 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-modest_edit_msg_window_set_msg
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_requires_auth
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -422,25 +326,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -449,6 +334,7 @@ modest_store_widget_get_remember_password
 modest_store_widget_get_username
 modest_store_widget_get_servername
 modest_store_widget_get_proto
+modest_store_widget_get_path
 <SUBSECTION Standard>
 MODEST_STORE_WIDGET
 MODEST_IS_STORE_WIDGET
@@ -460,50 +346,38 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_requires_auth
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-view</FILE>
-<TITLE>ModestAccountView</TITLE>
-ModestAccountView
-modest_account_view_new
-modest_account_view_get_selected_account
+<FILE>modest-msg-view-window</FILE>
+<TITLE>ModestMsgViewWindow</TITLE>
+ModestMsgViewWindow
+modest_msg_view_window_new
 <SUBSECTION Standard>
-MODEST_ACCOUNT_VIEW
-MODEST_IS_ACCOUNT_VIEW
-MODEST_TYPE_ACCOUNT_VIEW
-modest_account_view_get_type
-MODEST_ACCOUNT_VIEW_CLASS
-MODEST_IS_ACCOUNT_VIEW_CLASS
-MODEST_ACCOUNT_VIEW_GET_CLASS
+MODEST_MSG_VIEW_WINDOW
+MODEST_IS_MSG_VIEW_WINDOW
+MODEST_TYPE_MSG_VIEW_WINDOW
+modest_msg_view_window_get_type
+MODEST_MSG_VIEW_WINDOW_CLASS
+MODEST_IS_MSG_VIEW_WINDOW_CLASS
+MODEST_MSG_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -522,6 +396,8 @@ modest_header_view_get_columns
 modest_header_view_set_style
 modest_header_view_get_style
 modest_header_view_get_selected_headers
+modest_header_view_is_empty
+modest_header_view_select_next
 <SUBSECTION Standard>
 MODEST_HEADER_VIEW
 MODEST_IS_HEADER_VIEW
@@ -533,19 +409,54 @@ MODEST_HEADER_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-toolbar</FILE>
-ModestToolbarButton
-<TITLE>ModestToolbar</TITLE>
-ModestToolbar
-modest_toolbar_new
+<FILE>modest-account-view</FILE>
+<TITLE>ModestAccountView</TITLE>
+ModestAccountView
+modest_account_view_new
+modest_account_view_get_selected_account
+<SUBSECTION Standard>
+MODEST_ACCOUNT_VIEW
+MODEST_IS_ACCOUNT_VIEW
+MODEST_TYPE_ACCOUNT_VIEW
+modest_account_view_get_type
+MODEST_ACCOUNT_VIEW_CLASS
+MODEST_IS_ACCOUNT_VIEW_CLASS
+MODEST_ACCOUNT_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-stream-gtkhtml</FILE>
+<TITLE>ModestTnyStreamGtkhtml</TITLE>
+ModestTnyStreamGtkhtml
+modest_tny_stream_gtkhtml_new
+<SUBSECTION Standard>
+MODEST_TNY_STREAM_GTKHTML
+MODEST_IS_TNY_STREAM_GTKHTML
+MODEST_TYPE_TNY_STREAM_GTKHTML
+modest_tny_stream_gtkhtml_get_type
+MODEST_TNY_STREAM_GTKHTML_CLASS
+MODEST_IS_TNY_STREAM_GTKHTML_CLASS
+MODEST_TNY_STREAM_GTKHTML_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-msg-edit-window</FILE>
+<TITLE>ModestMsgEditWindow</TITLE>
+ModestMsgEditWindow
+ModestEditType
+MsgData
+modest_msg_edit_window_new
+modest_msg_edit_window_set_msg
+modest_msg_edit_window_get_msg_data
+modest_msg_edit_window_free_msg_data
 <SUBSECTION Standard>
-MODEST_TOOLBAR
-MODEST_IS_TOOLBAR
-MODEST_TYPE_TOOLBAR
-modest_toolbar_get_type
-MODEST_TOOLBAR_CLASS
-MODEST_IS_TOOLBAR_CLASS
-MODEST_TOOLBAR_GET_CLASS
+MODEST_MSG_EDIT_WINDOW
+MODEST_IS_MSG_EDIT_WINDOW
+MODEST_TYPE_MSG_EDIT_WINDOW
+modest_msg_edit_window_get_type
+MODEST_MSG_EDIT_WINDOW_CLASS
+MODEST_IS_MSG_EDIT_WINDOW_CLASS
+MODEST_MSG_EDIT_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -554,9 +465,10 @@ MODEST_TOOLBAR_GET_CLASS
 ModestFolderView
 modest_folder_view_new
 modest_folder_view_set_title
-modest_folder_view_is_empty
-modest_folder_view_guess_folder_type
-modest_folder_view_get_selected_account
+modest_folder_view_get_selected
+modest_folder_view_rename
+modest_folder_view_add_subfolder
+modest_folder_view_update_model
 <SUBSECTION Standard>
 MODEST_FOLDER_VIEW
 MODEST_IS_FOLDER_VIEW
@@ -585,6 +497,21 @@ MODEST_COMBO_BOX_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-main-window</FILE>
+<TITLE>ModestMainWindow</TITLE>
+ModestMainWindow
+modest_main_window_new
+<SUBSECTION Standard>
+MODEST_MAIN_WINDOW
+MODEST_IS_MAIN_WINDOW
+MODEST_TYPE_MAIN_WINDOW
+modest_main_window_get_type
+MODEST_MAIN_WINDOW_CLASS
+MODEST_IS_MAIN_WINDOW_CLASS
+MODEST_MAIN_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-msg-view</FILE>
 <TITLE>ModestMsgView</TITLE>
 ModestMsgView
@@ -601,64 +528,283 @@ MODEST_MSG_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-attachment</FILE>
-<TITLE>ModestTnyAttachment</TITLE>
-ModestTnyAttachment
-modest_tny_attachment_new
-modest_tny_attachment_set_name
-modest_tny_attachment_get_name
-modest_tny_attachment_set_filename
-modest_tny_attachment_get_filename
-modest_tny_attachment_set_mime_type
-modest_tny_attachment_get_mime_type
-modest_tny_attachment_guess_mime_type
-modest_tny_attachment_get_stream
-modest_tny_attachment_free_list
+<FILE>modest-window</FILE>
+ModestWindowParent
+ModestWindowParentClass
+<TITLE>ModestWindow</TITLE>
+ModestWindow
 <SUBSECTION Standard>
-MODEST_TNY_ATTACHMENT
-MODEST_IS_TNY_ATTACHMENT
-MODEST_TYPE_TNY_ATTACHMENT
-modest_tny_attachment_get_type
-MODEST_TNY_ATTACHMENT_CLASS
-MODEST_IS_TNY_ATTACHMENT_CLASS
-MODEST_TNY_ATTACHMENT_GET_CLASS
+MODEST_WINDOW
+MODEST_IS_WINDOW
+MODEST_TYPE_WINDOW
+modest_window_get_type
+MODEST_WINDOW_CLASS
+MODEST_IS_WINDOW_CLASS
+MODEST_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-ui</FILE>
-<TITLE>ModestUI</TITLE>
-ModestUI
-modest_ui_new
-modest_ui_main_window
+<FILE>modest-msg-view-window</FILE>
+<TITLE>ModestMsgViewWindow</TITLE>
+ModestMsgViewWindow
+modest_msg_view_window_new
 <SUBSECTION Standard>
-MODEST_UI
-MODEST_IS_UI
-MODEST_TYPE_UI
-modest_ui_get_type
-MODEST_UI_CLASS
-MODEST_IS_UI_CLASS
-MODEST_UI_GET_CLASS
+MODEST_MSG_VIEW_WINDOW
+MODEST_IS_MSG_VIEW_WINDOW
+MODEST_TYPE_MSG_VIEW_WINDOW
+modest_msg_view_window_get_type
+MODEST_MSG_VIEW_WINDOW_CLASS
+MODEST_IS_MSG_VIEW_WINDOW_CLASS
+MODEST_MSG_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-mgr</FILE>
-<TITLE>ModestAccountMgr</TITLE>
-ModestAccountMgr
-ModestServerAccountData
-ModestAccountData
-modest_account_mgr_new
-modest_account_mgr_add_account
-modest_account_mgr_add_server_account
-modest_account_mgr_remove_account
-modest_account_mgr_account_names
-modest_account_mgr_search_server_accounts
-modest_account_mgr_account_exists
-modest_account_mgr_get_account_data
-modest_account_mgr_free_account_data
-modest_account_mgr_account_set_enabled
-modest_account_mgr_account_get_enabled
-modest_account_mgr_get_string
-modest_account_mgr_get_int
+<FILE>modest-header-view</FILE>
+MODEST_HEADER_VIEW_COLUMN
+ModestHeaderViewColumn
+ModestHeaderViewStyle
+ModestItemType
+<TITLE>ModestHeaderView</TITLE>
+ModestHeaderView
+modest_header_view_new
+modest_header_view_set_folder
+modest_header_view_get_folder
+modest_header_view_set_columns
+modest_header_view_get_columns
+modest_header_view_set_style
+modest_header_view_get_style
+modest_header_view_get_selected_headers
+modest_header_view_is_empty
+modest_header_view_select_next
+<SUBSECTION Standard>
+MODEST_HEADER_VIEW
+MODEST_IS_HEADER_VIEW
+MODEST_TYPE_HEADER_VIEW
+modest_header_view_get_type
+MODEST_HEADER_VIEW_CLASS
+MODEST_IS_HEADER_VIEW_CLASS
+MODEST_HEADER_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-view</FILE>
+<TITLE>ModestAccountView</TITLE>
+ModestAccountView
+modest_account_view_new
+modest_account_view_get_selected_account
+<SUBSECTION Standard>
+MODEST_ACCOUNT_VIEW
+MODEST_IS_ACCOUNT_VIEW
+MODEST_TYPE_ACCOUNT_VIEW
+modest_account_view_get_type
+MODEST_ACCOUNT_VIEW_CLASS
+MODEST_IS_ACCOUNT_VIEW_CLASS
+MODEST_ACCOUNT_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-stream-gtkhtml</FILE>
+<TITLE>ModestTnyStreamGtkhtml</TITLE>
+ModestTnyStreamGtkhtml
+modest_tny_stream_gtkhtml_new
+<SUBSECTION Standard>
+MODEST_TNY_STREAM_GTKHTML
+MODEST_IS_TNY_STREAM_GTKHTML
+MODEST_TYPE_TNY_STREAM_GTKHTML
+modest_tny_stream_gtkhtml_get_type
+MODEST_TNY_STREAM_GTKHTML_CLASS
+MODEST_IS_TNY_STREAM_GTKHTML_CLASS
+MODEST_TNY_STREAM_GTKHTML_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-msg-edit-window</FILE>
+<TITLE>ModestMsgEditWindow</TITLE>
+ModestMsgEditWindow
+ModestEditType
+MsgData
+modest_msg_edit_window_new
+modest_msg_edit_window_set_msg
+modest_msg_edit_window_get_msg_data
+modest_msg_edit_window_free_msg_data
+<SUBSECTION Standard>
+MODEST_MSG_EDIT_WINDOW
+MODEST_IS_MSG_EDIT_WINDOW
+MODEST_TYPE_MSG_EDIT_WINDOW
+modest_msg_edit_window_get_type
+MODEST_MSG_EDIT_WINDOW_CLASS
+MODEST_IS_MSG_EDIT_WINDOW_CLASS
+MODEST_MSG_EDIT_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-folder-view</FILE>
+<TITLE>ModestFolderView</TITLE>
+ModestFolderView
+modest_folder_view_new
+modest_folder_view_set_title
+modest_folder_view_get_selected
+modest_folder_view_rename
+modest_folder_view_add_subfolder
+modest_folder_view_update_model
+<SUBSECTION Standard>
+MODEST_FOLDER_VIEW
+MODEST_IS_FOLDER_VIEW
+MODEST_TYPE_FOLDER_VIEW
+modest_folder_view_get_type
+MODEST_FOLDER_VIEW_CLASS
+MODEST_IS_FOLDER_VIEW_CLASS
+MODEST_FOLDER_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-combo-box</FILE>
+<TITLE>ModestComboBox</TITLE>
+ModestComboBox
+modest_combo_box_new
+modest_combo_box_get_active_id
+modest_combo_box_get_active_display_name
+<SUBSECTION Standard>
+MODEST_COMBO_BOX
+MODEST_IS_COMBO_BOX
+MODEST_TYPE_COMBO_BOX
+modest_combo_box_get_type
+MODEST_COMBO_BOX_CLASS
+MODEST_IS_COMBO_BOX_CLASS
+MODEST_COMBO_BOX_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window</FILE>
+<TITLE>ModestMainWindow</TITLE>
+ModestMainWindow
+modest_main_window_new
+<SUBSECTION Standard>
+MODEST_MAIN_WINDOW
+MODEST_IS_MAIN_WINDOW
+MODEST_TYPE_MAIN_WINDOW
+modest_main_window_get_type
+MODEST_MAIN_WINDOW_CLASS
+MODEST_IS_MAIN_WINDOW_CLASS
+MODEST_MAIN_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-msg-view</FILE>
+<TITLE>ModestMsgView</TITLE>
+ModestMsgView
+modest_msg_view_new
+modest_msg_view_set_message
+<SUBSECTION Standard>
+MODEST_MSG_VIEW
+MODEST_IS_MSG_VIEW
+MODEST_TYPE_MSG_VIEW
+modest_msg_view_get_type
+MODEST_MSG_VIEW_CLASS
+MODEST_IS_MSG_VIEW_CLASS
+MODEST_MSG_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-window</FILE>
+ModestWindowParent
+ModestWindowParentClass
+<TITLE>ModestWindow</TITLE>
+ModestWindow
+<SUBSECTION Standard>
+MODEST_WINDOW
+MODEST_IS_WINDOW
+MODEST_TYPE_WINDOW
+modest_window_get_type
+MODEST_WINDOW_CLASS
+MODEST_IS_WINDOW_CLASS
+MODEST_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-assistant</FILE>
+<TITLE>ModestAccountAssistant</TITLE>
+ModestAccountAssistant
+modest_account_assistant_new
+<SUBSECTION Standard>
+MODEST_ACCOUNT_ASSISTANT
+MODEST_IS_ACCOUNT_ASSISTANT
+MODEST_TYPE_ACCOUNT_ASSISTANT
+modest_account_assistant_get_type
+MODEST_ACCOUNT_ASSISTANT_CLASS
+MODEST_IS_ACCOUNT_ASSISTANT_CLASS
+MODEST_ACCOUNT_ASSISTANT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-view-window</FILE>
+<TITLE>ModestAccountViewWindow</TITLE>
+ModestAccountViewWindow
+modest_account_view_window_new
+<SUBSECTION Standard>
+MODEST_ACCOUNT_VIEW_WINDOW
+MODEST_IS_ACCOUNT_VIEW_WINDOW
+MODEST_TYPE_ACCOUNT_VIEW_WINDOW
+modest_account_view_window_get_type
+MODEST_ACCOUNT_VIEW_WINDOW_CLASS
+MODEST_IS_ACCOUNT_VIEW_WINDOW_CLASS
+MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-store-widget</FILE>
+<TITLE>ModestStoreWidget</TITLE>
+ModestStoreWidget
+modest_store_widget_new
+modest_store_widget_get_remember_password
+modest_store_widget_get_username
+modest_store_widget_get_servername
+modest_store_widget_get_proto
+modest_store_widget_get_path
+<SUBSECTION Standard>
+MODEST_STORE_WIDGET
+MODEST_IS_STORE_WIDGET
+MODEST_TYPE_STORE_WIDGET
+modest_store_widget_get_type
+MODEST_STORE_WIDGET_CLASS
+MODEST_IS_STORE_WIDGET_CLASS
+MODEST_STORE_WIDGET_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_requires_auth
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
+<SUBSECTION Standard>
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-mgr</FILE>
+<TITLE>ModestAccountMgr</TITLE>
+ModestAccountMgr
+modest_account_mgr_new
+modest_account_mgr_add_account
+modest_account_mgr_add_server_account
+modest_account_mgr_add_server_account_uri
+modest_account_mgr_remove_account
+modest_account_mgr_account_names
+modest_account_mgr_search_server_accounts
+modest_account_mgr_account_exists
+modest_account_mgr_get_string
+modest_account_mgr_get_int
 modest_account_mgr_get_bool
 modest_account_mgr_get_list
 modest_account_mgr_set_string
@@ -677,39 +823,6 @@ MODEST_ACCOUNT_MGR_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-protocol-mgr</FILE>
-<TITLE>ModestProtocolMgr</TITLE>
-ModestProtocolMgr
-MODEST_PROTOCOL_TRANSPORT_SENDMAIL
-MODEST_PROTOCOL_TRANSPORT_SMTP
-MODEST_PROTOCOL_STORE_NONE
-MODEST_PROTOCOL_STORE_POP
-MODEST_PROTOCOL_STORE_IMAP
-MODEST_PROTOCOL_STORE_MAILDIR
-MODEST_PROTOCOL_STORE_MBOX
-MODEST_PROTOCOL_SECURITY_NONE
-MODEST_PROTOCOL_SECURITY_SSL
-MODEST_PROTOCOL_SECURITY_TLS
-MODEST_PROTOCOL_AUTH_NONE
-MODEST_PROTOCOL_AUTH_PASSWORD
-ModestProtocolType
-modest_protocol_mgr_new
-modest_protocol_mgr_get_transport_protocols
-modest_protocol_mgr_get_store_protocols
-modest_protocol_mgr_get_security_protocols
-modest_protocol_mgr_get_auth_protocols
-modest_protocol_mgr_protocol_is_valid
-<SUBSECTION Standard>
-MODEST_PROTOCOL_MGR
-MODEST_IS_PROTOCOL_MGR
-MODEST_TYPE_PROTOCOL_MGR
-modest_protocol_mgr_get_type
-MODEST_PROTOCOL_MGR_CLASS
-MODEST_IS_PROTOCOL_MGR_CLASS
-MODEST_PROTOCOL_MGR_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-conf</FILE>
 ModestConfValueType
 ModestConfEvent
@@ -741,13 +854,29 @@ MODEST_CONF_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-formatter</FILE>
+<TITLE>ModestFormatter</TITLE>
+ModestFormatter
+modest_formatter_new
+modest_formatter_cite
+modest_formatter_quote
+modest_formatter_inline
+modest_formatter_attach
+<SUBSECTION Standard>
+MODEST_FORMATTER
+MODEST_IS_FORMATTER
+MODEST_TYPE_FORMATTER
+modest_formatter_get_type
+MODEST_FORMATTER_CLASS
+MODEST_IS_FORMATTER_CLASS
+MODEST_FORMATTER_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-tny-platform-factory</FILE>
 <TITLE>ModestTnyPlatformFactory</TITLE>
 ModestTnyPlatformFactory
 modest_tny_platform_factory_get_instance
-modest_tny_platform_factory_get_modest_account_mgr_instance
-modest_tny_platform_factory_get_modest_conf_instance
-modest_tny_platform_factory_get_modest_mail_operation_queue_instance
 <SUBSECTION Standard>
 MODEST_TNY_PLATFORM_FACTORY
 MODEST_IS_TNY_PLATFORM_FACTORY
@@ -778,40 +907,6 @@ MODEST_MAIL_OPERATION_QUEUE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-formatter</FILE>
-<TITLE>ModestFormatter</TITLE>
-ModestFormatter
-modest_formatter_new
-modest_formatter_cite
-modest_formatter_quote
-modest_formatter_inline
-modest_formatter_attach
-<SUBSECTION Standard>
-MODEST_FORMATTER
-MODEST_IS_FORMATTER
-MODEST_TYPE_FORMATTER
-modest_formatter_get_type
-MODEST_FORMATTER_CLASS
-MODEST_IS_FORMATTER_CLASS
-MODEST_FORMATTER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-tny-stream-gtkhtml</FILE>
-<TITLE>ModestTnyStreamGtkhtml</TITLE>
-ModestTnyStreamGtkhtml
-modest_tny_stream_gtkhtml_new
-<SUBSECTION Standard>
-MODEST_TNY_STREAM_GTKHTML
-MODEST_IS_TNY_STREAM_GTKHTML
-MODEST_TYPE_TNY_STREAM_GTKHTML
-modest_tny_stream_gtkhtml_get_type
-MODEST_TNY_STREAM_GTKHTML_CLASS
-MODEST_IS_TNY_STREAM_GTKHTML_CLASS
-MODEST_TNY_STREAM_GTKHTML_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-mail-operation</FILE>
 ModestMailOperationForwardType
 ModestMailOperationReplyType
@@ -850,147 +945,77 @@ MODEST_MAIL_OPERATION_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-widget-factory</FILE>
-<TITLE>ModestWidgetFactory</TITLE>
-ModestWidgetFactory
-ModestComboBoxType
-modest_widget_factory_new
-modest_widget_factory_get_folder_view
-modest_widget_factory_get_header_view
-modest_widget_factory_get_msg_preview
-modest_widget_factory_get_account_view
-modest_widget_factory_get_progress_bar
-modest_widget_factory_get_status_bar
-modest_widget_factory_get_combo_box
-modest_widget_factory_get_online_toggle
-modest_widget_factory_get_folder_info_label
-modest_widget_factory_get_main_toolbar
-modest_widget_factory_get_edit_toolbar
-<SUBSECTION Standard>
-MODEST_WIDGET_FACTORY
-MODEST_IS_WIDGET_FACTORY
-MODEST_TYPE_WIDGET_FACTORY
-modest_widget_factory_get_type
-MODEST_WIDGET_FACTORY_CLASS
-MODEST_IS_WIDGET_FACTORY_CLASS
-MODEST_WIDGET_FACTORY_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-tny-account-store</FILE>
 ModestTnyGetPassFunc
 <TITLE>ModestTnyAccountStore</TITLE>
 ModestTnyAccountStore
 modest_tny_account_store_new
+modest_tny_account_store_get_tny_account_by_id
+modest_tny_account_store_get_tny_account_by_account
 tny_account_store_get_session
 <SUBSECTION Standard>
 MODEST_TNY_ACCOUNT_STORE
 MODEST_IS_TNY_ACCOUNT_STORE
 MODEST_TYPE_TNY_ACCOUNT_STORE
-modest_tny_account_store_get_type
-MODEST_TNY_ACCOUNT_STORE_CLASS
-MODEST_IS_TNY_ACCOUNT_STORE_CLASS
-MODEST_TNY_ACCOUNT_STORE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-account-assistant</FILE>
-<TITLE>ModestAccountAssistant</TITLE>
-ModestAccountAssistant
-modest_account_assistant_new
-<SUBSECTION Standard>
-MODEST_ACCOUNT_ASSISTANT
-MODEST_IS_ACCOUNT_ASSISTANT
-MODEST_TYPE_ACCOUNT_ASSISTANT
-modest_account_assistant_get_type
-MODEST_ACCOUNT_ASSISTANT_CLASS
-MODEST_IS_ACCOUNT_ASSISTANT_CLASS
-MODEST_ACCOUNT_ASSISTANT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-account-view-window</FILE>
-<TITLE>ModestAccountViewWindow</TITLE>
-ModestAccountViewWindow
-modest_account_view_window_new
-<SUBSECTION Standard>
-MODEST_ACCOUNT_VIEW_WINDOW
-MODEST_IS_ACCOUNT_VIEW_WINDOW
-MODEST_TYPE_ACCOUNT_VIEW_WINDOW
-modest_account_view_window_get_type
-MODEST_ACCOUNT_VIEW_WINDOW_CLASS
-MODEST_IS_ACCOUNT_VIEW_WINDOW_CLASS
-MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
+modest_tny_account_store_get_type
+MODEST_TNY_ACCOUNT_STORE_CLASS
+MODEST_IS_TNY_ACCOUNT_STORE_CLASS
+MODEST_TNY_ACCOUNT_STORE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-store-widget</FILE>
-<TITLE>ModestStoreWidget</TITLE>
-ModestStoreWidget
-modest_store_widget_new
-modest_store_widget_get_remember_password
-modest_store_widget_get_username
-modest_store_widget_get_servername
-modest_store_widget_get_proto
+<FILE>modest-cache-mgr</FILE>
+<TITLE>ModestCacheMgr</TITLE>
+ModestCacheMgr
+ModestCacheMgrCacheType
+modest_cache_mgr_new
+modest_cache_mgr_get_cache
+modest_cache_mgr_flush
+modest_cache_mgr_flush_all
+modest_cache_mgr_get_size
 <SUBSECTION Standard>
-MODEST_STORE_WIDGET
-MODEST_IS_STORE_WIDGET
-MODEST_TYPE_STORE_WIDGET
-modest_store_widget_get_type
-MODEST_STORE_WIDGET_CLASS
-MODEST_IS_STORE_WIDGET_CLASS
-MODEST_STORE_WIDGET_GET_CLASS
+MODEST_CACHE_MGR
+MODEST_IS_CACHE_MGR
+MODEST_TYPE_CACHE_MGR
+modest_cache_mgr_get_type
+MODEST_CACHE_MGR_CLASS
+MODEST_IS_CACHE_MGR_CLASS
+MODEST_CACHE_MGR_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-modest_edit_msg_window_set_msg
+<FILE>modest-tny-send-queue</FILE>
+<TITLE>ModestTnySendQueue</TITLE>
+ModestTnySendQueue
+modest_tny_send_queue_new
 <SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
+MODEST_TNY_SEND_QUEUE
+MODEST_IS_TNY_SEND_QUEUE
+MODEST_TYPE_TNY_SEND_QUEUE
+modest_tny_send_queue_get_type
+MODEST_TNY_SEND_QUEUE_CLASS
+MODEST_IS_TNY_SEND_QUEUE_CLASS
+MODEST_TNY_SEND_QUEUE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
+<FILE>modest-singletons</FILE>
+<TITLE>ModestSingletons</TITLE>
+ModestSingletons
+modest_singletons_new
+modest_singletons_get_conf
+modest_singletons_get_account_mgr
+modest_singletons_get_account_store
+modest_singletons_get_cache_mgr
+modest_singletons_get_mail_operation_queue
 <SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
+MODEST_SINGLETONS
+MODEST_IS_SINGLETONS
+MODEST_TYPE_SINGLETONS
+modest_singletons_get_type
+MODEST_SINGLETONS_CLASS
+MODEST_IS_SINGLETONS_CLASS
+MODEST_SINGLETONS_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -1024,25 +1049,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -1051,6 +1057,7 @@ modest_store_widget_get_remember_password
 modest_store_widget_get_username
 modest_store_widget_get_servername
 modest_store_widget_get_proto
+modest_store_widget_get_path
 <SUBSECTION Standard>
 MODEST_STORE_WIDGET
 MODEST_IS_STORE_WIDGET
@@ -1062,144 +1069,23 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
-<SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-account-view</FILE>
-<TITLE>ModestAccountView</TITLE>
-ModestAccountView
-modest_account_view_new
-modest_account_view_get_selected_account
-<SUBSECTION Standard>
-MODEST_ACCOUNT_VIEW
-MODEST_IS_ACCOUNT_VIEW
-MODEST_TYPE_ACCOUNT_VIEW
-modest_account_view_get_type
-MODEST_ACCOUNT_VIEW_CLASS
-MODEST_IS_ACCOUNT_VIEW_CLASS
-MODEST_ACCOUNT_VIEW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-header-view</FILE>
-MODEST_HEADER_VIEW_COLUMN
-ModestHeaderViewColumn
-ModestHeaderViewStyle
-ModestItemType
-<TITLE>ModestHeaderView</TITLE>
-ModestHeaderView
-modest_header_view_new
-modest_header_view_set_folder
-modest_header_view_get_folder
-modest_header_view_set_columns
-modest_header_view_get_columns
-modest_header_view_set_style
-modest_header_view_get_style
-modest_header_view_get_selected_headers
-<SUBSECTION Standard>
-MODEST_HEADER_VIEW
-MODEST_IS_HEADER_VIEW
-MODEST_TYPE_HEADER_VIEW
-modest_header_view_get_type
-MODEST_HEADER_VIEW_CLASS
-MODEST_IS_HEADER_VIEW_CLASS
-MODEST_HEADER_VIEW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-toolbar</FILE>
-ModestToolbarButton
-<TITLE>ModestToolbar</TITLE>
-ModestToolbar
-modest_toolbar_new
-<SUBSECTION Standard>
-MODEST_TOOLBAR
-MODEST_IS_TOOLBAR
-MODEST_TYPE_TOOLBAR
-modest_toolbar_get_type
-MODEST_TOOLBAR_CLASS
-MODEST_IS_TOOLBAR_CLASS
-MODEST_TOOLBAR_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-folder-view</FILE>
-<TITLE>ModestFolderView</TITLE>
-ModestFolderView
-modest_folder_view_new
-modest_folder_view_set_title
-modest_folder_view_is_empty
-modest_folder_view_guess_folder_type
-modest_folder_view_get_selected_account
-<SUBSECTION Standard>
-MODEST_FOLDER_VIEW
-MODEST_IS_FOLDER_VIEW
-MODEST_TYPE_FOLDER_VIEW
-modest_folder_view_get_type
-MODEST_FOLDER_VIEW_CLASS
-MODEST_IS_FOLDER_VIEW_CLASS
-MODEST_FOLDER_VIEW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-combo-box</FILE>
-<TITLE>ModestComboBox</TITLE>
-ModestComboBox
-modest_combo_box_new
-modest_combo_box_get_active_id
-modest_combo_box_get_active_display_name
-<SUBSECTION Standard>
-MODEST_COMBO_BOX
-MODEST_IS_COMBO_BOX
-MODEST_TYPE_COMBO_BOX
-modest_combo_box_get_type
-MODEST_COMBO_BOX_CLASS
-MODEST_IS_COMBO_BOX_CLASS
-MODEST_COMBO_BOX_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-msg-view</FILE>
-<TITLE>ModestMsgView</TITLE>
-ModestMsgView
-modest_msg_view_new
-modest_msg_view_set_message
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_requires_auth
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_MSG_VIEW
-MODEST_IS_MSG_VIEW
-MODEST_TYPE_MSG_VIEW
-modest_msg_view_get_type
-MODEST_MSG_VIEW_CLASS
-MODEST_IS_MSG_VIEW_CLASS
-MODEST_MSG_VIEW_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -1233,25 +1119,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -1260,6 +1127,7 @@ modest_store_widget_get_remember_password
 modest_store_widget_get_username
 modest_store_widget_get_servername
 modest_store_widget_get_proto
+modest_store_widget_get_path
 <SUBSECTION Standard>
 MODEST_STORE_WIDGET
 MODEST_IS_STORE_WIDGET
@@ -1271,51 +1139,38 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-modest_edit_msg_window_set_msg
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_requires_auth
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-view</FILE>
-<TITLE>ModestAccountView</TITLE>
-ModestAccountView
-modest_account_view_new
-modest_account_view_get_selected_account
+<FILE>modest-msg-view-window</FILE>
+<TITLE>ModestMsgViewWindow</TITLE>
+ModestMsgViewWindow
+modest_msg_view_window_new
 <SUBSECTION Standard>
-MODEST_ACCOUNT_VIEW
-MODEST_IS_ACCOUNT_VIEW
-MODEST_TYPE_ACCOUNT_VIEW
-modest_account_view_get_type
-MODEST_ACCOUNT_VIEW_CLASS
-MODEST_IS_ACCOUNT_VIEW_CLASS
-MODEST_ACCOUNT_VIEW_GET_CLASS
+MODEST_MSG_VIEW_WINDOW
+MODEST_IS_MSG_VIEW_WINDOW
+MODEST_TYPE_MSG_VIEW_WINDOW
+modest_msg_view_window_get_type
+MODEST_MSG_VIEW_WINDOW_CLASS
+MODEST_IS_MSG_VIEW_WINDOW_CLASS
+MODEST_MSG_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -1334,6 +1189,8 @@ modest_header_view_get_columns
 modest_header_view_set_style
 modest_header_view_get_style
 modest_header_view_get_selected_headers
+modest_header_view_is_empty
+modest_header_view_select_next
 <SUBSECTION Standard>
 MODEST_HEADER_VIEW
 MODEST_IS_HEADER_VIEW
@@ -1345,19 +1202,54 @@ MODEST_HEADER_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-toolbar</FILE>
-ModestToolbarButton
-<TITLE>ModestToolbar</TITLE>
-ModestToolbar
-modest_toolbar_new
+<FILE>modest-account-view</FILE>
+<TITLE>ModestAccountView</TITLE>
+ModestAccountView
+modest_account_view_new
+modest_account_view_get_selected_account
+<SUBSECTION Standard>
+MODEST_ACCOUNT_VIEW
+MODEST_IS_ACCOUNT_VIEW
+MODEST_TYPE_ACCOUNT_VIEW
+modest_account_view_get_type
+MODEST_ACCOUNT_VIEW_CLASS
+MODEST_IS_ACCOUNT_VIEW_CLASS
+MODEST_ACCOUNT_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-stream-gtkhtml</FILE>
+<TITLE>ModestTnyStreamGtkhtml</TITLE>
+ModestTnyStreamGtkhtml
+modest_tny_stream_gtkhtml_new
+<SUBSECTION Standard>
+MODEST_TNY_STREAM_GTKHTML
+MODEST_IS_TNY_STREAM_GTKHTML
+MODEST_TYPE_TNY_STREAM_GTKHTML
+modest_tny_stream_gtkhtml_get_type
+MODEST_TNY_STREAM_GTKHTML_CLASS
+MODEST_IS_TNY_STREAM_GTKHTML_CLASS
+MODEST_TNY_STREAM_GTKHTML_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-msg-edit-window</FILE>
+<TITLE>ModestMsgEditWindow</TITLE>
+ModestMsgEditWindow
+ModestEditType
+MsgData
+modest_msg_edit_window_new
+modest_msg_edit_window_set_msg
+modest_msg_edit_window_get_msg_data
+modest_msg_edit_window_free_msg_data
 <SUBSECTION Standard>
-MODEST_TOOLBAR
-MODEST_IS_TOOLBAR
-MODEST_TYPE_TOOLBAR
-modest_toolbar_get_type
-MODEST_TOOLBAR_CLASS
-MODEST_IS_TOOLBAR_CLASS
-MODEST_TOOLBAR_GET_CLASS
+MODEST_MSG_EDIT_WINDOW
+MODEST_IS_MSG_EDIT_WINDOW
+MODEST_TYPE_MSG_EDIT_WINDOW
+modest_msg_edit_window_get_type
+MODEST_MSG_EDIT_WINDOW_CLASS
+MODEST_IS_MSG_EDIT_WINDOW_CLASS
+MODEST_MSG_EDIT_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -1366,9 +1258,10 @@ MODEST_TOOLBAR_GET_CLASS
 ModestFolderView
 modest_folder_view_new
 modest_folder_view_set_title
-modest_folder_view_is_empty
-modest_folder_view_guess_folder_type
-modest_folder_view_get_selected_account
+modest_folder_view_get_selected
+modest_folder_view_rename
+modest_folder_view_add_subfolder
+modest_folder_view_update_model
 <SUBSECTION Standard>
 MODEST_FOLDER_VIEW
 MODEST_IS_FOLDER_VIEW
@@ -1397,6 +1290,21 @@ MODEST_COMBO_BOX_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-main-window</FILE>
+<TITLE>ModestMainWindow</TITLE>
+ModestMainWindow
+modest_main_window_new
+<SUBSECTION Standard>
+MODEST_MAIN_WINDOW
+MODEST_IS_MAIN_WINDOW
+MODEST_TYPE_MAIN_WINDOW
+modest_main_window_get_type
+MODEST_MAIN_WINDOW_CLASS
+MODEST_IS_MAIN_WINDOW_CLASS
+MODEST_MAIN_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-msg-view</FILE>
 <TITLE>ModestMsgView</TITLE>
 ModestMsgView
@@ -1413,17 +1321,101 @@ MODEST_MSG_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-store-actions</FILE>
-modest_tny_store_actions_create_folder
-modest_tny_store_actions_remove_folder
-modest_tny_store_actions_rename_folder
-modest_tny_store_actions_move_folder
+<FILE>modest-window</FILE>
+ModestWindowParent
+ModestWindowParentClass
+<TITLE>ModestWindow</TITLE>
+ModestWindow
+<SUBSECTION Standard>
+MODEST_WINDOW
+MODEST_IS_WINDOW
+MODEST_TYPE_WINDOW
+modest_window_get_type
+MODEST_WINDOW_CLASS
+MODEST_IS_WINDOW_CLASS
+MODEST_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-ui-actions</FILE>
+modest_ui_actions_on_about
+modest_ui_actions_on_delete
+modest_ui_actions_on_quit
+modest_ui_actions_on_accounts
+modest_ui_actions_on_new_msg
+modest_ui_actions_on_open
+modest_ui_actions_on_reply
+modest_ui_actions_on_forward
+modest_ui_actions_on_reply_all
+modest_ui_actions_on_next
+modest_ui_actions_toggle_view
+modest_ui_actions_on_header_selected
+modest_ui_actions_on_header_activated
+modest_ui_actions_on_folder_selection_changed
+modest_ui_actions_on_online_toggle_toggled
+modest_ui_actions_on_item_not_found
+modest_ui_actions_on_header_status_update
+modest_ui_actions_on_msg_link_hover
+modest_ui_actions_on_msg_link_clicked
+modest_ui_actions_on_msg_attachment_clicked
+modest_ui_actions_on_send
+modest_ui_actions_on_new_folder
+modest_ui_actions_on_rename_folder
+modest_ui_actions_on_delete_folder
+modest_ui_actions_on_move_folder_to_trash_folder
+modest_ui_actions_on_connection_changed
+modest_ui_actions_on_accounts_reloaded
+modest_ui_actions_on_folder_moved
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-keys</FILE>
-MODEST_CONF_DEFAULT_ACCOUNT
+<FILE>modest-text-utils</FILE>
+modest_text_utils_derived_subject
+modest_text_utils_quote
+modest_text_utils_cite
+modest_text_utils_inline
+modest_text_utils_remove_address
+modest_text_utils_convert_to_html
+modest_text_utils_strftime
+modest_text_utils_get_display_address
+modest_text_utils_get_subject_prefix_len
+modest_text_utils_utf8_strcmp
+modest_text_utils_get_display_date
+modest_text_utils_get_display_size
+modest_text_utils_validate_email_address
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-folder</FILE>
+ModestTnyFolderRules
+modest_tny_folder_guess_folder_type
+modest_tny_folder_guess_folder_type_from_name
+modest_tny_folder_is_local_folder
+modest_tny_folder_get_local_folder_type
+modest_tny_folder_get_rules
+</SECTION>
+
+<SECTION>
+<FILE>modest-pair</FILE>
+ModestPair
+ModestPairList
+modest_pair_new
+modest_pair_free
+modest_pair_list_free
+</SECTION>
+
+<SECTION>
+<FILE>modest-defs</FILE>
+MODEST_DIR
+MODEST_CACHE_DIR
+MODEST_LOCAL_FOLDERS_ACCOUNT_NAME
+MODEST_LOCAL_FOLDERS_ACCOUNT_ID
+MODEST_LOCAL_FOLDERS_MAILDIR
+MODEST_LOCAL_FOLDERS_DISPLAY_NAME
+MODEST_CONF_NAMESPACE
+MODEST_CONF_WIDGET_NAMESPACE
 MODEST_ACCOUNT_NAMESPACE
+MODEST_CONF_DEFAULT_ACCOUNT
 MODEST_SERVER_ACCOUNT_NAMESPACE
 MODEST_CONF_REPLY_TYPE
 MODEST_CONF_FORWARD_TYPE
@@ -1436,102 +1428,36 @@ MODEST_ACCOUNT_PASSWORD
 MDOEST_ACCOUNT_REMEMBER_PWD
 MODEST_ACCOUNT_HOSTNAME
 MODEST_ACCOUNT_USERNAME
+MODEST_ACCOUNT_URI
 MODEST_ACCOUNT_PROTO
 MODEST_ACCOUNT_ENABLED
+MODEST_ACCOUNT_TYPE
+MODEST_ACCOUNT_LAST_UPDATED
 MODEST_ACCOUNT_LEAVE_ON_SERVER
 MODEST_ACCOUNT_PREFERRED_CNX
 MODEST_ACCOUNT_OPTIONS
 </SECTION>
 
 <SECTION>
-<FILE>modest-text-utils</FILE>
-modest_text_utils_derived_subject
-modest_text_utils_quote
-modest_text_utils_cite
-modest_text_utils_inline
-modest_text_utils_remove_address
-modest_text_utils_convert_to_html
-modest_text_utils_strftime
-modest_text_utils_display_address
-</SECTION>
-
-<SECTION>
-<FILE>modest-presets</FILE>
-ModestPresets
-ModestPresetsInfo
-modest_presets_new
-modest_presets_get_providers
-modest_presets_get_server
-modest_presets_get_info
-modest_presets_destroy
+<FILE>modest-runtime</FILE>
+MODEST_DEBUG
+ModestRuntimeDebugFlags
+modest_runtime_init
+modest_runtime_init_ui
+modest_runtime_uninit
+modest_runtime_get_debug_flags
+modest_runtime_get_conf
+modest_runtime_get_account_mgr
+modest_runtime_get_account_store
+modest_runtime_get_cache_mgr
+modest_runtime_get_mail_operation_queue
+modest_runtime_get_send_queue
 </SECTION>
 
 <SECTION>
-<FILE>modest-pair</FILE>
-ModestPair
-modest_pair_new
-modest_pair_destroy
-modest_pair_gslist_destroy
-</SECTION>
-
-<SECTION>
-<FILE>modest-icon-factory</FILE>
-modest_icon_factory_init
-modest_icon_factory_uninit
-modest_icon_factory_get_icon
-modest_icon_factory_get_icon_at_size
-modest_icon_factory_get_small_icon
-modest_icon_factory_get_big_icon
-</SECTION>
-
-<SECTION>
-<FILE>modest-conf-keys</FILE>
-MODEST_CONF_NAMESPACE
-MODEST_CONF_WIDGET_NAMESPACE
-MODEST_MAIN_WINDOW_HEIGHT
-MODEST_MAIN_WINDOW_HEIGHT_DEFAULT
-MODEST_MAIN_WINDOW_WIDTH
-MODEST_MAIN_WINDOW_WIDTH_DEFAULT
-MODEST_MAIN_PANED_HEIGHT
-MODEST_MAIN_PANED_HEIGHT_DEFAULT
-MODEST_FOLDER_PANED_WIDTH
-MODEST_FOLDER_PANED_WIDTH_DEFAULT
-MODEST_FOLDER_PANED_DIVIDER_POS
-MODEST_FOLDER_PANED_DIVIDER_POS_DEFAULT
-MODEST_MSG_PANED_WIDTH
-MODEST_MSG_PANED_WIDTH_DEFAULT
-MODEST_MSG_PANED_DIVIDER_POS
-MODEST_MSG_PANED_DIVIDER_POS_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_HEIGHT_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_WIDTH_DEFAULT
-MODEST_EDIT_WINDOW_HEIGHT
-MODEST_EDIT_WINDOW_HEIGHT_DEFAULT
-MODEST_EDIT_WINDOW_WIDTH
-MODEST_EDIT_WINDOW_WIDTH_DEFAULT
-MODEST_MSG_VIEW_NAMESPACE
-MODEST_MSG_VIEW_SHOW_ATTACHMENTS_INLINE
-</SECTION>
-
-<SECTION>
-<FILE>modest-proto</FILE>
-MODEST_PROTO_SENDMAIL
-MODEST_PROTO_SMTP
-MODEST_PROTO_NONE
-MODEST_PROTO_POP
-MODEST_PROTO_IMAP
-MODEST_PROTO_MAILDIR
-MODEST_PROTO_MBOX
-MODEST_SECURITY_PROTO_NONE
-MODEST_SECURITY_PROTO_SSL
-MODEST_SECURITY_PROTO_TLS
-MODEST_AUTH_PROTO_PASSWORD
-ModestProtoType
-modest_proto_is_valid
-modest_proto_type
-modest_proto_store_protos
-modest_proto_transport_protos
-modest_proto_security_protos
-modest_proto_auth_protos
+<FILE>modest-error</FILE>
+ModestErrorDomain
+ModestErrorCode
 </SECTION>
 
 <SECTION>
@@ -1541,10 +1467,16 @@ modest_widget_memory_restore
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-msg-actions</FILE>
-modest_tny_msg_actions_find_body_part
-modest_tny_msg_actions_find_nth_part
-modest_tny_msg_actions_find_body
+<FILE>modest-protocol-info</FILE>
+ModestProtocol
+ModestProtocolType
+modest_protocol_info_get_protocol_list
+modest_protocol_info_get_protocol_pair_list
+modest_protocol_info_get_protocol_type
+modest_protocol_info_get_protocol
+modest_protocol_info_get_protocol_name
+modest_protocol_info_get_protocol_display_name
+modest_protocol_info_protocol_is_local_store
 </SECTION>
 
 <SECTION>
@@ -1559,18 +1491,61 @@ modest_marshal_VOID__STRING_BOOLEAN
 modest_marshal_VOID__STRING_BOOL
 modest_marshal_VOID__STRING_STRING_BOOLEAN
 modest_marshal_VOID__STRING_STRING_BOOL
-modest_marshal_VOID__STRING_POINTER_POINTER_POINTER
 </SECTION>
 
 <SECTION>
-<FILE>modest-error</FILE>
-ModestErrorDomain
-ModestErrorCode
+<FILE>modest-tny-msg</FILE>
+modest_tny_msg_new
+modest_tny_msg_find_body_part
+modest_tny_msg_get_body
+</SECTION>
+
+<SECTION>
+<FILE>modest-local-folder-info</FILE>
+modest_local_folder_info_get_type
+modest_local_folder_info_get_type_name
+modest_local_folder_info_get_type_display_name
+modest_local_folder_info_get_maildir_path
+</SECTION>
+
+<SECTION>
+<FILE>modest-widget-memory-priv</FILE>
+MODEST_WIDGET_MEMORY_PARAM_X
+MODEST_WIDGET_MEMORY_PARAM_Y
+MODEST_WIDGET_MEMORY_PARAM_HEIGHT
+MODEST_WIDGET_MEMORY_PARAM_WIDTH
+MODEST_WIDGET_MEMORY_PARAM_POS
+MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-mgr-helpers</FILE>
+ModestServerAccountData
+ModestAccountData
+modest_account_mgr_get_account_data
+modest_account_mgr_get_default_account
+modest_account_mgr_set_default_account
+modest_account_mgr_free_account_data
+modest_account_mgr_set_enabled
+modest_account_mgr_get_enabled
+modest_account_mgr_get_from_string
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-account</FILE>
+modest_tny_account_new_from_account
+modest_tny_account_new_for_local_folders
+modest_tny_account_get_special_folder
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-mgr-priv</FILE>
+ModestAccountMgrPrivate
+MODEST_ACCOUNT_MGR_GET_PRIVATE
 </SECTION>
 
 <SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1599,11 +1574,24 @@ MODEST_TOOLBAR_ICON_DELETE
 MODEST_TOOLBAR_ICON_NEXT
 MODEST_TOOLBAR_ICON_PREV
 MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window-ui</FILE>
 </SECTION>
 
 <SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1632,6 +1620,20 @@ MODEST_TOOLBAR_ICON_DELETE
 MODEST_TOOLBAR_ICON_NEXT
 MODEST_TOOLBAR_ICON_PREV
 MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window-ui</FILE>
 </SECTION>
 
 <SECTION>
@@ -1639,34 +1641,105 @@ MODEST_TOOLBAR_ICON_STOP
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-store-actions</FILE>
-modest_tny_store_actions_create_folder
-modest_tny_store_actions_remove_folder
-modest_tny_store_actions_rename_folder
-modest_tny_store_actions_move_folder
+<FILE>modest-msg-edit-window-ui</FILE>
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-keys</FILE>
-MODEST_CONF_DEFAULT_ACCOUNT
-MODEST_ACCOUNT_NAMESPACE
-MODEST_SERVER_ACCOUNT_NAMESPACE
-MODEST_CONF_REPLY_TYPE
-MODEST_CONF_FORWARD_TYPE
-MODEST_ACCOUNT_DISPLAY_NAME
-MODEST_ACCOUNT_STORE_ACCOUNT
-MODEST_ACCOUNT_TRANSPORT_ACCOUNT
-MODEST_ACCOUNT_FULLNAME
-MODEST_ACCOUNT_EMAIL
-MODEST_ACCOUNT_PASSWORD
-MDOEST_ACCOUNT_REMEMBER_PWD
-MODEST_ACCOUNT_HOSTNAME
-MODEST_ACCOUNT_USERNAME
-MODEST_ACCOUNT_PROTO
-MODEST_ACCOUNT_ENABLED
-MODEST_ACCOUNT_LEAVE_ON_SERVER
-MODEST_ACCOUNT_PREFERRED_CNX
-MODEST_ACCOUNT_OPTIONS
+<FILE>modest-window-priv</FILE>
+ModestWindowPrivate
+MODEST_WINDOW_GET_PRIVATE
+</SECTION>
+
+<SECTION>
+<FILE>modest-header-view-priv</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>modest-msg-edit-window-ui</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>modest-window-priv</FILE>
+ModestWindowPrivate
+MODEST_WINDOW_GET_PRIVATE
+</SECTION>
+
+<SECTION>
+<FILE>modest-icon-names</FILE>
+MODEST_APP_ICON
+MODEST_HEADER_ICON_READ
+MODEST_HEADER_ICON_UNREAD
+MODEST_HEADER_ICON_DELETED
+MODEST_HEADER_ICON_ATTACH
+MODEST_FOLDER_ICON_OPEN
+MODEST_FOLDER_ICON_CLOSED
+MODEST_FOLDER_ICON_ACCOUNT
+MODEST_FOLDER_ICON_INBOX
+MODEST_FOLDER_ICON_OUTBOX
+MODEST_FOLDER_ICON_SENT
+MODEST_FOLDER_ICON_TRASH
+MODEST_FOLDER_ICON_JUNK
+MODEST_FOLDER_ICON_DRAFTS
+MODEST_FOLDER_ICON_NORMAL
+MODEST_FOLDER_ICON_CONTACTS
+MODEST_FOLDER_ICON_NOTES
+MODEST_FOLDER_ICON_CALENDAR
+MODEST_TOOLBAR_ICON_MAIL_SEND
+MODEST_TOOLBAR_ICON_NEW_MAIL
+MODEST_TOOLBAR_ICON_SEND_RECEIVE
+MODEST_TOOLBAR_ICON_REPLY
+MODEST_TOOLBAR_ICON_REPLY_ALL
+MODEST_TOOLBAR_ICON_FORWARD
+MODEST_TOOLBAR_ICON_DELETE
+MODEST_TOOLBAR_ICON_NEXT
+MODEST_TOOLBAR_ICON_PREV
+MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window-ui</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>modest-ui-actions</FILE>
+modest_ui_actions_on_about
+modest_ui_actions_on_delete
+modest_ui_actions_on_quit
+modest_ui_actions_on_accounts
+modest_ui_actions_on_new_msg
+modest_ui_actions_on_open
+modest_ui_actions_on_reply
+modest_ui_actions_on_forward
+modest_ui_actions_on_reply_all
+modest_ui_actions_on_next
+modest_ui_actions_toggle_view
+modest_ui_actions_on_header_selected
+modest_ui_actions_on_header_activated
+modest_ui_actions_on_folder_selection_changed
+modest_ui_actions_on_online_toggle_toggled
+modest_ui_actions_on_item_not_found
+modest_ui_actions_on_header_status_update
+modest_ui_actions_on_msg_link_hover
+modest_ui_actions_on_msg_link_clicked
+modest_ui_actions_on_msg_attachment_clicked
+modest_ui_actions_on_send
+modest_ui_actions_on_new_folder
+modest_ui_actions_on_rename_folder
+modest_ui_actions_on_delete_folder
+modest_ui_actions_on_move_folder_to_trash_folder
+modest_ui_actions_on_connection_changed
+modest_ui_actions_on_accounts_reloaded
+modest_ui_actions_on_folder_moved
 </SECTION>
 
 <SECTION>
@@ -1678,86 +1751,87 @@ modest_text_utils_inline
 modest_text_utils_remove_address
 modest_text_utils_convert_to_html
 modest_text_utils_strftime
-modest_text_utils_display_address
+modest_text_utils_get_display_address
+modest_text_utils_get_subject_prefix_len
+modest_text_utils_utf8_strcmp
+modest_text_utils_get_display_date
+modest_text_utils_get_display_size
+modest_text_utils_validate_email_address
 </SECTION>
 
 <SECTION>
-<FILE>modest-presets</FILE>
-ModestPresets
-ModestPresetsInfo
-modest_presets_new
-modest_presets_get_providers
-modest_presets_get_server
-modest_presets_get_info
-modest_presets_destroy
+<FILE>modest-tny-folder</FILE>
+ModestTnyFolderRules
+modest_tny_folder_guess_folder_type
+modest_tny_folder_guess_folder_type_from_name
+modest_tny_folder_is_local_folder
+modest_tny_folder_get_local_folder_type
+modest_tny_folder_get_rules
 </SECTION>
 
 <SECTION>
 <FILE>modest-pair</FILE>
 ModestPair
+ModestPairList
 modest_pair_new
-modest_pair_destroy
-modest_pair_gslist_destroy
+modest_pair_free
+modest_pair_list_free
 </SECTION>
 
 <SECTION>
-<FILE>modest-icon-factory</FILE>
-modest_icon_factory_init
-modest_icon_factory_uninit
-modest_icon_factory_get_icon
-modest_icon_factory_get_icon_at_size
-modest_icon_factory_get_small_icon
-modest_icon_factory_get_big_icon
+<FILE>modest-defs</FILE>
+MODEST_DIR
+MODEST_CACHE_DIR
+MODEST_LOCAL_FOLDERS_ACCOUNT_NAME
+MODEST_LOCAL_FOLDERS_ACCOUNT_ID
+MODEST_LOCAL_FOLDERS_MAILDIR
+MODEST_LOCAL_FOLDERS_DISPLAY_NAME
+MODEST_CONF_NAMESPACE
+MODEST_CONF_WIDGET_NAMESPACE
+MODEST_ACCOUNT_NAMESPACE
+MODEST_CONF_DEFAULT_ACCOUNT
+MODEST_SERVER_ACCOUNT_NAMESPACE
+MODEST_CONF_REPLY_TYPE
+MODEST_CONF_FORWARD_TYPE
+MODEST_ACCOUNT_DISPLAY_NAME
+MODEST_ACCOUNT_STORE_ACCOUNT
+MODEST_ACCOUNT_TRANSPORT_ACCOUNT
+MODEST_ACCOUNT_FULLNAME
+MODEST_ACCOUNT_EMAIL
+MODEST_ACCOUNT_PASSWORD
+MDOEST_ACCOUNT_REMEMBER_PWD
+MODEST_ACCOUNT_HOSTNAME
+MODEST_ACCOUNT_USERNAME
+MODEST_ACCOUNT_URI
+MODEST_ACCOUNT_PROTO
+MODEST_ACCOUNT_ENABLED
+MODEST_ACCOUNT_TYPE
+MODEST_ACCOUNT_LAST_UPDATED
+MODEST_ACCOUNT_LEAVE_ON_SERVER
+MODEST_ACCOUNT_PREFERRED_CNX
+MODEST_ACCOUNT_OPTIONS
 </SECTION>
 
 <SECTION>
-<FILE>modest-conf-keys</FILE>
-MODEST_CONF_NAMESPACE
-MODEST_CONF_WIDGET_NAMESPACE
-MODEST_MAIN_WINDOW_HEIGHT
-MODEST_MAIN_WINDOW_HEIGHT_DEFAULT
-MODEST_MAIN_WINDOW_WIDTH
-MODEST_MAIN_WINDOW_WIDTH_DEFAULT
-MODEST_MAIN_PANED_HEIGHT
-MODEST_MAIN_PANED_HEIGHT_DEFAULT
-MODEST_FOLDER_PANED_WIDTH
-MODEST_FOLDER_PANED_WIDTH_DEFAULT
-MODEST_FOLDER_PANED_DIVIDER_POS
-MODEST_FOLDER_PANED_DIVIDER_POS_DEFAULT
-MODEST_MSG_PANED_WIDTH
-MODEST_MSG_PANED_WIDTH_DEFAULT
-MODEST_MSG_PANED_DIVIDER_POS
-MODEST_MSG_PANED_DIVIDER_POS_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_HEIGHT_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_WIDTH_DEFAULT
-MODEST_EDIT_WINDOW_HEIGHT
-MODEST_EDIT_WINDOW_HEIGHT_DEFAULT
-MODEST_EDIT_WINDOW_WIDTH
-MODEST_EDIT_WINDOW_WIDTH_DEFAULT
-MODEST_MSG_VIEW_NAMESPACE
-MODEST_MSG_VIEW_SHOW_ATTACHMENTS_INLINE
-</SECTION>
-
-<SECTION>
-<FILE>modest-proto</FILE>
-MODEST_PROTO_SENDMAIL
-MODEST_PROTO_SMTP
-MODEST_PROTO_NONE
-MODEST_PROTO_POP
-MODEST_PROTO_IMAP
-MODEST_PROTO_MAILDIR
-MODEST_PROTO_MBOX
-MODEST_SECURITY_PROTO_NONE
-MODEST_SECURITY_PROTO_SSL
-MODEST_SECURITY_PROTO_TLS
-MODEST_AUTH_PROTO_PASSWORD
-ModestProtoType
-modest_proto_is_valid
-modest_proto_type
-modest_proto_store_protos
-modest_proto_transport_protos
-modest_proto_security_protos
-modest_proto_auth_protos
+<FILE>modest-runtime</FILE>
+MODEST_DEBUG
+ModestRuntimeDebugFlags
+modest_runtime_init
+modest_runtime_init_ui
+modest_runtime_uninit
+modest_runtime_get_debug_flags
+modest_runtime_get_conf
+modest_runtime_get_account_mgr
+modest_runtime_get_account_store
+modest_runtime_get_cache_mgr
+modest_runtime_get_mail_operation_queue
+modest_runtime_get_send_queue
+</SECTION>
+
+<SECTION>
+<FILE>modest-error</FILE>
+ModestErrorDomain
+ModestErrorCode
 </SECTION>
 
 <SECTION>
@@ -1767,10 +1841,16 @@ modest_widget_memory_restore
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-msg-actions</FILE>
-modest_tny_msg_actions_find_body_part
-modest_tny_msg_actions_find_nth_part
-modest_tny_msg_actions_find_body
+<FILE>modest-protocol-info</FILE>
+ModestProtocol
+ModestProtocolType
+modest_protocol_info_get_protocol_list
+modest_protocol_info_get_protocol_pair_list
+modest_protocol_info_get_protocol_type
+modest_protocol_info_get_protocol
+modest_protocol_info_get_protocol_name
+modest_protocol_info_get_protocol_display_name
+modest_protocol_info_protocol_is_local_store
 </SECTION>
 
 <SECTION>
@@ -1785,51 +1865,61 @@ modest_marshal_VOID__STRING_BOOLEAN
 modest_marshal_VOID__STRING_BOOL
 modest_marshal_VOID__STRING_STRING_BOOLEAN
 modest_marshal_VOID__STRING_STRING_BOOL
-modest_marshal_VOID__STRING_POINTER_POINTER_POINTER
 </SECTION>
 
 <SECTION>
-<FILE>modest-error</FILE>
-ModestErrorDomain
-ModestErrorCode
+<FILE>modest-tny-msg</FILE>
+modest_tny_msg_new
+modest_tny_msg_find_body_part
+modest_tny_msg_get_body
 </SECTION>
 
 <SECTION>
-<FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
-MODEST_APP_ICON
-MODEST_HEADER_ICON_READ
-MODEST_HEADER_ICON_UNREAD
-MODEST_HEADER_ICON_DELETED
-MODEST_HEADER_ICON_ATTACH
-MODEST_FOLDER_ICON_OPEN
-MODEST_FOLDER_ICON_CLOSED
-MODEST_FOLDER_ICON_ACCOUNT
-MODEST_FOLDER_ICON_INBOX
-MODEST_FOLDER_ICON_OUTBOX
-MODEST_FOLDER_ICON_SENT
-MODEST_FOLDER_ICON_TRASH
-MODEST_FOLDER_ICON_JUNK
-MODEST_FOLDER_ICON_DRAFTS
-MODEST_FOLDER_ICON_NORMAL
-MODEST_FOLDER_ICON_CONTACTS
-MODEST_FOLDER_ICON_NOTES
-MODEST_FOLDER_ICON_CALENDAR
-MODEST_TOOLBAR_ICON_MAIL_SEND
-MODEST_TOOLBAR_ICON_NEW_MAIL
-MODEST_TOOLBAR_ICON_SEND_RECEIVE
-MODEST_TOOLBAR_ICON_REPLY
-MODEST_TOOLBAR_ICON_REPLY_ALL
-MODEST_TOOLBAR_ICON_FORWARD
-MODEST_TOOLBAR_ICON_DELETE
-MODEST_TOOLBAR_ICON_NEXT
-MODEST_TOOLBAR_ICON_PREV
-MODEST_TOOLBAR_ICON_STOP
+<FILE>modest-local-folder-info</FILE>
+modest_local_folder_info_get_type
+modest_local_folder_info_get_type_name
+modest_local_folder_info_get_type_display_name
+modest_local_folder_info_get_maildir_path
+</SECTION>
+
+<SECTION>
+<FILE>modest-widget-memory-priv</FILE>
+MODEST_WIDGET_MEMORY_PARAM_X
+MODEST_WIDGET_MEMORY_PARAM_Y
+MODEST_WIDGET_MEMORY_PARAM_HEIGHT
+MODEST_WIDGET_MEMORY_PARAM_WIDTH
+MODEST_WIDGET_MEMORY_PARAM_POS
+MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-mgr-helpers</FILE>
+ModestServerAccountData
+ModestAccountData
+modest_account_mgr_get_account_data
+modest_account_mgr_get_default_account
+modest_account_mgr_set_default_account
+modest_account_mgr_free_account_data
+modest_account_mgr_set_enabled
+modest_account_mgr_get_enabled
+modest_account_mgr_get_from_string
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-account</FILE>
+modest_tny_account_new_from_account
+modest_tny_account_new_for_local_folders
+modest_tny_account_get_special_folder
+</SECTION>
+
+<SECTION>
+<FILE>modest-account-mgr-priv</FILE>
+ModestAccountMgrPrivate
+MODEST_ACCOUNT_MGR_GET_PRIVATE
 </SECTION>
 
 <SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1858,15 +1948,24 @@ MODEST_TOOLBAR_ICON_DELETE
 MODEST_TOOLBAR_ICON_NEXT
 MODEST_TOOLBAR_ICON_PREV
 MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
 </SECTION>
 
 <SECTION>
-<FILE>modest-header-view-priv</FILE>
+<FILE>modest-main-window-ui</FILE>
 </SECTION>
 
 <SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1895,9 +1994,33 @@ MODEST_TOOLBAR_ICON_DELETE
 MODEST_TOOLBAR_ICON_NEXT
 MODEST_TOOLBAR_ICON_PREV
 MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window-ui</FILE>
 </SECTION>
 
 <SECTION>
 <FILE>modest-header-view-priv</FILE>
 </SECTION>
 
+<SECTION>
+<FILE>modest-msg-edit-window-ui</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>modest-window-priv</FILE>
+ModestWindowPrivate
+MODEST_WINDOW_GET_PRIVATE
+</SECTION>
+