some directory renames

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@603 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/GNUmakefile b/SOGo/UI/GNUmakefile
index 419a4bd960de607d4dbb02f092786a4ae06ab9a3..0cfcf7ff994332537d4631581695979038d28dac 100644 (file)
--- a/SOGo/UI/GNUmakefile
+++ b/SOGo/UI/GNUmakefile
@@ -7,15 +7,15 @@ SUBPROJECTS += \
        Common          \
        Scheduler       \
        Contacts        \
-       Mailer          \
+       MailerUI        \
        MailPartViewers \
        Anais           \
 
 ifneq ($(FOUNDATION_LIB),apple)
 # experimental
 SUBPROJECTS += \
-       MailerContacts  \
-       MailerScheduler
+       MailerContactsUI        \
+       MailerSchedulerUI
 endif
 
 SUBPROJECTS += \

diff --git a/SOGo/UI/MailerContacts/ChangeLog b/SOGo/UI/MailerContactsUI/ChangeLog
similarity index 100%
rename from SOGo/UI/MailerContacts/ChangeLog
rename to SOGo/UI/MailerContactsUI/ChangeLog

diff --git a/SOGo/UI/MailerContacts/GNUmakefile b/SOGo/UI/MailerContactsUI/GNUmakefile
similarity index 100%
rename from SOGo/UI/MailerContacts/GNUmakefile
rename to SOGo/UI/MailerContactsUI/GNUmakefile

diff --git a/SOGo/UI/MailerContacts/MailerContactsUIProduct.m b/SOGo/UI/MailerContactsUI/MailerContactsUIProduct.m
similarity index 100%
rename from SOGo/UI/MailerContacts/MailerContactsUIProduct.m
rename to SOGo/UI/MailerContactsUI/MailerContactsUIProduct.m

diff --git a/SOGo/UI/MailerContacts/UIxMailContactEditor.m b/SOGo/UI/MailerContactsUI/UIxMailContactEditor.m
similarity index 100%
rename from SOGo/UI/MailerContacts/UIxMailContactEditor.m
rename to SOGo/UI/MailerContactsUI/UIxMailContactEditor.m

diff --git a/SOGo/UI/MailerContacts/UIxMailContactList.m b/SOGo/UI/MailerContactsUI/UIxMailContactList.m
similarity index 100%
rename from SOGo/UI/MailerContacts/UIxMailContactList.m
rename to SOGo/UI/MailerContactsUI/UIxMailContactList.m

diff --git a/SOGo/UI/MailerContacts/Version b/SOGo/UI/MailerContactsUI/Version
similarity index 100%
rename from SOGo/UI/MailerContacts/Version
rename to SOGo/UI/MailerContactsUI/Version

diff --git a/SOGo/UI/MailerContacts/common.h b/SOGo/UI/MailerContactsUI/common.h
similarity index 100%
rename from SOGo/UI/MailerContacts/common.h
rename to SOGo/UI/MailerContactsUI/common.h

diff --git a/SOGo/UI/MailerContacts/mailercontacts.js b/SOGo/UI/MailerContactsUI/mailercontacts.js
similarity index 100%
rename from SOGo/UI/MailerContacts/mailercontacts.js
rename to SOGo/UI/MailerContactsUI/mailercontacts.js

diff --git a/SOGo/UI/MailerContacts/product.plist b/SOGo/UI/MailerContactsUI/product.plist
similarity index 100%
rename from SOGo/UI/MailerContacts/product.plist
rename to SOGo/UI/MailerContactsUI/product.plist

diff --git a/SOGo/UI/MailerScheduler/ChangeLog b/SOGo/UI/MailerSchedulerUI/ChangeLog
similarity index 100%
rename from SOGo/UI/MailerScheduler/ChangeLog
rename to SOGo/UI/MailerSchedulerUI/ChangeLog

diff --git a/SOGo/UI/MailerScheduler/GNUmakefile b/SOGo/UI/MailerSchedulerUI/GNUmakefile
similarity index 100%
rename from SOGo/UI/MailerScheduler/GNUmakefile
rename to SOGo/UI/MailerSchedulerUI/GNUmakefile

diff --git a/SOGo/UI/MailerScheduler/MailerSchedulerUIProduct.m b/SOGo/UI/MailerSchedulerUI/MailerSchedulerUIProduct.m
similarity index 100%
rename from SOGo/UI/MailerScheduler/MailerSchedulerUIProduct.m
rename to SOGo/UI/MailerSchedulerUI/MailerSchedulerUIProduct.m

diff --git a/SOGo/UI/MailerScheduler/UIxMailCalWeekOverview.m b/SOGo/UI/MailerSchedulerUI/UIxMailCalWeekOverview.m
similarity index 100%
rename from SOGo/UI/MailerScheduler/UIxMailCalWeekOverview.m
rename to SOGo/UI/MailerSchedulerUI/UIxMailCalWeekOverview.m

diff --git a/SOGo/UI/MailerScheduler/Version b/SOGo/UI/MailerSchedulerUI/Version
similarity index 100%
rename from SOGo/UI/MailerScheduler/Version
rename to SOGo/UI/MailerSchedulerUI/Version

diff --git a/SOGo/UI/MailerScheduler/common.h b/SOGo/UI/MailerSchedulerUI/common.h
similarity index 100%
rename from SOGo/UI/MailerScheduler/common.h
rename to SOGo/UI/MailerSchedulerUI/common.h

diff --git a/SOGo/UI/MailerScheduler/product.plist b/SOGo/UI/MailerSchedulerUI/product.plist
similarity index 100%
rename from SOGo/UI/MailerScheduler/product.plist
rename to SOGo/UI/MailerSchedulerUI/product.plist

diff --git a/SOGo/UI/Mailer/COPYING b/SOGo/UI/MailerUI/COPYING
similarity index 100%
rename from SOGo/UI/Mailer/COPYING
rename to SOGo/UI/MailerUI/COPYING

diff --git a/SOGo/UI/Mailer/COPYRIGHT b/SOGo/UI/MailerUI/COPYRIGHT
similarity index 100%
rename from SOGo/UI/Mailer/COPYRIGHT
rename to SOGo/UI/MailerUI/COPYRIGHT

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
similarity index 100%
rename from SOGo/UI/Mailer/ChangeLog
rename to SOGo/UI/MailerUI/ChangeLog

diff --git a/SOGo/UI/Mailer/English.lproj/default.strings b/SOGo/UI/MailerUI/English.lproj/default.strings
similarity index 100%
rename from SOGo/UI/Mailer/English.lproj/default.strings
rename to SOGo/UI/MailerUI/English.lproj/default.strings

diff --git a/SOGo/UI/Mailer/French.lproj/default.strings b/SOGo/UI/MailerUI/French.lproj/default.strings
similarity index 100%
rename from SOGo/UI/Mailer/French.lproj/default.strings
rename to SOGo/UI/MailerUI/French.lproj/default.strings

diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/MailerUI/GNUmakefile
similarity index 100%
rename from SOGo/UI/Mailer/GNUmakefile
rename to SOGo/UI/MailerUI/GNUmakefile

diff --git a/SOGo/UI/Mailer/GNUmakefile.postamble b/SOGo/UI/MailerUI/GNUmakefile.postamble
similarity index 100%
rename from SOGo/UI/Mailer/GNUmakefile.postamble
rename to SOGo/UI/MailerUI/GNUmakefile.postamble

diff --git a/SOGo/UI/Mailer/Images/COPYING b/SOGo/UI/MailerUI/Images/COPYING
similarity index 100%
rename from SOGo/UI/Mailer/Images/COPYING
rename to SOGo/UI/MailerUI/Images/COPYING

diff --git a/SOGo/UI/Mailer/Images/LICENSE-thunderbird.txt b/SOGo/UI/MailerUI/Images/LICENSE-thunderbird.txt
similarity index 100%
rename from SOGo/UI/Mailer/Images/LICENSE-thunderbird.txt
rename to SOGo/UI/MailerUI/Images/LICENSE-thunderbird.txt

diff --git a/SOGo/UI/Mailer/Images/icon_mark_flagged.gif b/SOGo/UI/MailerUI/Images/icon_mark_flagged.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/icon_mark_flagged.gif
rename to SOGo/UI/MailerUI/Images/icon_mark_flagged.gif

diff --git a/SOGo/UI/Mailer/Images/icon_mark_read.gif b/SOGo/UI/MailerUI/Images/icon_mark_read.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/icon_mark_read.gif
rename to SOGo/UI/MailerUI/Images/icon_mark_read.gif

diff --git a/SOGo/UI/Mailer/Images/icon_mark_unflagged.gif b/SOGo/UI/MailerUI/Images/icon_mark_unflagged.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/icon_mark_unflagged.gif
rename to SOGo/UI/MailerUI/Images/icon_mark_unflagged.gif

diff --git a/SOGo/UI/Mailer/Images/icon_mark_unread.gif b/SOGo/UI/MailerUI/Images/icon_mark_unread.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/icon_mark_unread.gif
rename to SOGo/UI/MailerUI/Images/icon_mark_unread.gif

diff --git a/SOGo/UI/Mailer/Images/icon_read.gif b/SOGo/UI/MailerUI/Images/icon_read.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/icon_read.gif
rename to SOGo/UI/MailerUI/Images/icon_read.gif

diff --git a/SOGo/UI/Mailer/Images/icon_unread.gif b/SOGo/UI/MailerUI/Images/icon_unread.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/icon_unread.gif
rename to SOGo/UI/MailerUI/Images/icon_unread.gif

diff --git a/SOGo/UI/Mailer/Images/lori_32x32.png b/SOGo/UI/MailerUI/Images/lori_32x32.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/lori_32x32.png
rename to SOGo/UI/MailerUI/Images/lori_32x32.png

diff --git a/SOGo/UI/Mailer/Images/message-mail-read.png b/SOGo/UI/MailerUI/Images/message-mail-read.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/message-mail-read.png
rename to SOGo/UI/MailerUI/Images/message-mail-read.png

diff --git a/SOGo/UI/Mailer/Images/message-mail.png b/SOGo/UI/MailerUI/Images/message-mail.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/message-mail.png
rename to SOGo/UI/MailerUI/Images/message-mail.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_addressbook.png b/SOGo/UI/MailerUI/Images/tbtb_addressbook.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_addressbook.png
rename to SOGo/UI/MailerUI/Images/tbtb_addressbook.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose.png b/SOGo/UI/MailerUI/Images/tbtb_compose.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_addressbook_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_addressbook_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_addressbook_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_addressbook_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_attach_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_attach_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_attach_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_attach_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_clip_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_clip_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_clip_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_clip_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_cut_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_cut_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_cut_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_cut_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_dup_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_dup_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_dup_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_dup_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_file_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_file_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_file_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_file_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_lock_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_lock_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_lock_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_lock_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_quote_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_quote_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_quote_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_quote_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_send_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_send_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_send_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_send_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_compose_spell_30x30.png b/SOGo/UI/MailerUI/Images/tbtb_compose_spell_30x30.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_compose_spell_30x30.png
rename to SOGo/UI/MailerUI/Images/tbtb_compose_spell_30x30.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_delete.png b/SOGo/UI/MailerUI/Images/tbtb_delete.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_delete.png
rename to SOGo/UI/MailerUI/Images/tbtb_delete.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_deletedoc.png b/SOGo/UI/MailerUI/Images/tbtb_deletedoc.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_deletedoc.png
rename to SOGo/UI/MailerUI/Images/tbtb_deletedoc.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_filetofolder.png b/SOGo/UI/MailerUI/Images/tbtb_filetofolder.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_filetofolder.png
rename to SOGo/UI/MailerUI/Images/tbtb_filetofolder.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_forward.png b/SOGo/UI/MailerUI/Images/tbtb_forward.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_forward.png
rename to SOGo/UI/MailerUI/Images/tbtb_forward.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_getmail.png b/SOGo/UI/MailerUI/Images/tbtb_getmail.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_getmail.png
rename to SOGo/UI/MailerUI/Images/tbtb_getmail.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_next.png b/SOGo/UI/MailerUI/Images/tbtb_next.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_next.png
rename to SOGo/UI/MailerUI/Images/tbtb_next.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_previous.png b/SOGo/UI/MailerUI/Images/tbtb_previous.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_previous.png
rename to SOGo/UI/MailerUI/Images/tbtb_previous.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_print.png b/SOGo/UI/MailerUI/Images/tbtb_print.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_print.png
rename to SOGo/UI/MailerUI/Images/tbtb_print.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_reply.png b/SOGo/UI/MailerUI/Images/tbtb_reply.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_reply.png
rename to SOGo/UI/MailerUI/Images/tbtb_reply.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_replyall.png b/SOGo/UI/MailerUI/Images/tbtb_replyall.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_replyall.png
rename to SOGo/UI/MailerUI/Images/tbtb_replyall.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_search.png b/SOGo/UI/MailerUI/Images/tbtb_search.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_search.png
rename to SOGo/UI/MailerUI/Images/tbtb_search.png

diff --git a/SOGo/UI/Mailer/Images/tbtb_trash.png b/SOGo/UI/MailerUI/Images/tbtb_trash.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtb_trash.png
rename to SOGo/UI/MailerUI/Images/tbtb_trash.png

diff --git a/SOGo/UI/Mailer/Images/tbtv_account_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_account_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_account_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_account_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_corner_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_corner_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_corner_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_corner_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_corner_minus_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_corner_minus_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_corner_minus_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_corner_minus_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_corner_plus_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_corner_plus_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_corner_plus_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_corner_plus_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_drafts_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_drafts_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_drafts_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_drafts_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_inbox_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_inbox_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_inbox_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_inbox_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_junction2_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_junction2_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_junction2_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_junction2_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_junction_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_junction_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_junction_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_junction_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_leaf_corner_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_leaf_corner_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_leaf_corner_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_leaf_corner_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_line_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_line_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_line_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_line_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_minus_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_minus_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_minus_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_minus_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_plus_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_plus_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_plus_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_plus_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_sent_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_sent_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_sent_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_sent_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/tbtv_trash_17x17.gif b/SOGo/UI/MailerUI/Images/tbtv_trash_17x17.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/tbtv_trash_17x17.gif
rename to SOGo/UI/MailerUI/Images/tbtv_trash_17x17.gif

diff --git a/SOGo/UI/Mailer/Images/title_attachment_14x14.png b/SOGo/UI/MailerUI/Images/title_attachment_14x14.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_attachment_14x14.png
rename to SOGo/UI/MailerUI/Images/title_attachment_14x14.png

diff --git a/SOGo/UI/Mailer/Images/title_config.png b/SOGo/UI/MailerUI/Images/title_config.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_config.png
rename to SOGo/UI/MailerUI/Images/title_config.png

diff --git a/SOGo/UI/Mailer/Images/title_junk.png b/SOGo/UI/MailerUI/Images/title_junk.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_junk.png
rename to SOGo/UI/MailerUI/Images/title_junk.png

diff --git a/SOGo/UI/Mailer/Images/title_read_14x14.png b/SOGo/UI/MailerUI/Images/title_read_14x14.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_read_14x14.png
rename to SOGo/UI/MailerUI/Images/title_read_14x14.png

diff --git a/SOGo/UI/Mailer/Images/title_sortdown_12x12.png b/SOGo/UI/MailerUI/Images/title_sortdown_12x12.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_sortdown_12x12.png
rename to SOGo/UI/MailerUI/Images/title_sortdown_12x12.png

diff --git a/SOGo/UI/Mailer/Images/title_sortup_12x12.png b/SOGo/UI/MailerUI/Images/title_sortup_12x12.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_sortup_12x12.png
rename to SOGo/UI/MailerUI/Images/title_sortup_12x12.png

diff --git a/SOGo/UI/Mailer/Images/title_thread.png b/SOGo/UI/MailerUI/Images/title_thread.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_thread.png
rename to SOGo/UI/MailerUI/Images/title_thread.png

diff --git a/SOGo/UI/Mailer/Images/treeview_corner.gif b/SOGo/UI/MailerUI/Images/treeview_corner.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_corner.gif
rename to SOGo/UI/MailerUI/Images/treeview_corner.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_corner_minus.gif b/SOGo/UI/MailerUI/Images/treeview_corner_minus.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_corner_minus.gif
rename to SOGo/UI/MailerUI/Images/treeview_corner_minus.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_corner_plus.gif b/SOGo/UI/MailerUI/Images/treeview_corner_plus.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_corner_plus.gif
rename to SOGo/UI/MailerUI/Images/treeview_corner_plus.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_junction.gif b/SOGo/UI/MailerUI/Images/treeview_junction.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_junction.gif
rename to SOGo/UI/MailerUI/Images/treeview_junction.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_leaf.gif b/SOGo/UI/MailerUI/Images/treeview_leaf.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_leaf.gif
rename to SOGo/UI/MailerUI/Images/treeview_leaf.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_leaf_corner.gif b/SOGo/UI/MailerUI/Images/treeview_leaf_corner.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_leaf_corner.gif
rename to SOGo/UI/MailerUI/Images/treeview_leaf_corner.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_line.gif b/SOGo/UI/MailerUI/Images/treeview_line.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_line.gif
rename to SOGo/UI/MailerUI/Images/treeview_line.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_minus.gif b/SOGo/UI/MailerUI/Images/treeview_minus.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_minus.gif
rename to SOGo/UI/MailerUI/Images/treeview_minus.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_plus.gif b/SOGo/UI/MailerUI/Images/treeview_plus.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_plus.gif
rename to SOGo/UI/MailerUI/Images/treeview_plus.gif

diff --git a/SOGo/UI/Mailer/Images/treeview_space.gif b/SOGo/UI/MailerUI/Images/treeview_space.gif
similarity index 100%
rename from SOGo/UI/Mailer/Images/treeview_space.gif
rename to SOGo/UI/MailerUI/Images/treeview_space.gif

diff --git a/SOGo/UI/Mailer/MailerUIProduct.m b/SOGo/UI/MailerUI/MailerUIProduct.m
similarity index 100%
rename from SOGo/UI/Mailer/MailerUIProduct.m
rename to SOGo/UI/MailerUI/MailerUIProduct.m

diff --git a/SOGo/UI/Mailer/NOTES b/SOGo/UI/MailerUI/NOTES
similarity index 100%
rename from SOGo/UI/Mailer/NOTES
rename to SOGo/UI/MailerUI/NOTES

diff --git a/SOGo/UI/Mailer/README b/SOGo/UI/MailerUI/README
similarity index 100%
rename from SOGo/UI/Mailer/README
rename to SOGo/UI/MailerUI/README

diff --git a/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m b/SOGo/UI/MailerUI/UIxEnvelopeAddressFormatter.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m
rename to SOGo/UI/MailerUI/UIxEnvelopeAddressFormatter.m

diff --git a/SOGo/UI/Mailer/UIxFilterList.m b/SOGo/UI/MailerUI/UIxFilterList.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxFilterList.m
rename to SOGo/UI/MailerUI/UIxFilterList.m

diff --git a/SOGo/UI/Mailer/UIxMailAccountView.m b/SOGo/UI/MailerUI/UIxMailAccountView.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailAccountView.m
rename to SOGo/UI/MailerUI/UIxMailAccountView.m

diff --git a/SOGo/UI/Mailer/UIxMailAccountsView.m b/SOGo/UI/MailerUI/UIxMailAccountsView.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailAccountsView.m
rename to SOGo/UI/MailerUI/UIxMailAccountsView.m

diff --git a/SOGo/UI/Mailer/UIxMailAddressbook.m b/SOGo/UI/MailerUI/UIxMailAddressbook.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailAddressbook.m
rename to SOGo/UI/MailerUI/UIxMailAddressbook.m

diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/MailerUI/UIxMailEditor.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailEditor.m
rename to SOGo/UI/MailerUI/UIxMailEditor.m

diff --git a/SOGo/UI/Mailer/UIxMailEditorAction.h b/SOGo/UI/MailerUI/UIxMailEditorAction.h
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailEditorAction.h
rename to SOGo/UI/MailerUI/UIxMailEditorAction.h

diff --git a/SOGo/UI/Mailer/UIxMailEditorAction.m b/SOGo/UI/MailerUI/UIxMailEditorAction.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailEditorAction.m
rename to SOGo/UI/MailerUI/UIxMailEditorAction.m

diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.m b/SOGo/UI/MailerUI/UIxMailEditorAttach.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailEditorAttach.m
rename to SOGo/UI/MailerUI/UIxMailEditorAttach.m

diff --git a/SOGo/UI/Mailer/UIxMailFilterPanel.m b/SOGo/UI/MailerUI/UIxMailFilterPanel.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailFilterPanel.m
rename to SOGo/UI/MailerUI/UIxMailFilterPanel.m

diff --git a/SOGo/UI/Mailer/UIxMailFormatter.h b/SOGo/UI/MailerUI/UIxMailFormatter.h
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailFormatter.h
rename to SOGo/UI/MailerUI/UIxMailFormatter.h

diff --git a/SOGo/UI/Mailer/UIxMailFormatter.m b/SOGo/UI/MailerUI/UIxMailFormatter.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailFormatter.m
rename to SOGo/UI/MailerUI/UIxMailFormatter.m

diff --git a/SOGo/UI/Mailer/UIxMailForwardAction.m b/SOGo/UI/MailerUI/UIxMailForwardAction.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailForwardAction.m
rename to SOGo/UI/MailerUI/UIxMailForwardAction.m

diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/MailerUI/UIxMailListView.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailListView.m
rename to SOGo/UI/MailerUI/UIxMailListView.m

diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailMainFrame.m
rename to SOGo/UI/MailerUI/UIxMailMainFrame.m

diff --git a/SOGo/UI/Mailer/UIxMailMoveToPopUp.m b/SOGo/UI/MailerUI/UIxMailMoveToPopUp.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailMoveToPopUp.m
rename to SOGo/UI/MailerUI/UIxMailMoveToPopUp.m

diff --git a/SOGo/UI/Mailer/UIxMailReplyAction.m b/SOGo/UI/MailerUI/UIxMailReplyAction.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailReplyAction.m
rename to SOGo/UI/MailerUI/UIxMailReplyAction.m

diff --git a/SOGo/UI/Mailer/UIxMailSortableTableHeader.m b/SOGo/UI/MailerUI/UIxMailSortableTableHeader.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailSortableTableHeader.m
rename to SOGo/UI/MailerUI/UIxMailSortableTableHeader.m

diff --git a/SOGo/UI/Mailer/UIxMailToSelection.m b/SOGo/UI/MailerUI/UIxMailToSelection.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailToSelection.m
rename to SOGo/UI/MailerUI/UIxMailToSelection.m

diff --git a/SOGo/UI/Mailer/UIxMailToolbar.m b/SOGo/UI/MailerUI/UIxMailToolbar.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailToolbar.m
rename to SOGo/UI/MailerUI/UIxMailToolbar.m

diff --git a/SOGo/UI/Mailer/UIxMailTree.m b/SOGo/UI/MailerUI/UIxMailTree.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailTree.m
rename to SOGo/UI/MailerUI/UIxMailTree.m

diff --git a/SOGo/UI/Mailer/UIxMailTreeBlock.h b/SOGo/UI/MailerUI/UIxMailTreeBlock.h
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailTreeBlock.h
rename to SOGo/UI/MailerUI/UIxMailTreeBlock.h

diff --git a/SOGo/UI/Mailer/UIxMailTreeBlock.m b/SOGo/UI/MailerUI/UIxMailTreeBlock.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailTreeBlock.m
rename to SOGo/UI/MailerUI/UIxMailTreeBlock.m

diff --git a/SOGo/UI/Mailer/UIxMailView.m b/SOGo/UI/MailerUI/UIxMailView.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailView.m
rename to SOGo/UI/MailerUI/UIxMailView.m

diff --git a/SOGo/UI/Mailer/UIxMailWindowCloser.m b/SOGo/UI/MailerUI/UIxMailWindowCloser.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxMailWindowCloser.m
rename to SOGo/UI/MailerUI/UIxMailWindowCloser.m

diff --git a/SOGo/UI/Mailer/UIxSieveEditor.m b/SOGo/UI/MailerUI/UIxSieveEditor.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxSieveEditor.m
rename to SOGo/UI/MailerUI/UIxSieveEditor.m

diff --git a/SOGo/UI/Mailer/UIxSubjectFormatter.m b/SOGo/UI/MailerUI/UIxSubjectFormatter.m
similarity index 100%
rename from SOGo/UI/Mailer/UIxSubjectFormatter.m
rename to SOGo/UI/MailerUI/UIxSubjectFormatter.m

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/MailerUI/Version
similarity index 100%
rename from SOGo/UI/Mailer/Version
rename to SOGo/UI/MailerUI/Version

diff --git a/SOGo/UI/Mailer/WOContext+UIxMailer.h b/SOGo/UI/MailerUI/WOContext+UIxMailer.h
similarity index 100%
rename from SOGo/UI/Mailer/WOContext+UIxMailer.h
rename to SOGo/UI/MailerUI/WOContext+UIxMailer.h

diff --git a/SOGo/UI/Mailer/WOContext+UIxMailer.m b/SOGo/UI/MailerUI/WOContext+UIxMailer.m
similarity index 100%
rename from SOGo/UI/Mailer/WOContext+UIxMailer.m
rename to SOGo/UI/MailerUI/WOContext+UIxMailer.m

diff --git a/SOGo/UI/Mailer/bundle-info.plist b/SOGo/UI/MailerUI/bundle-info.plist
similarity index 100%
rename from SOGo/UI/Mailer/bundle-info.plist
rename to SOGo/UI/MailerUI/bundle-info.plist

diff --git a/SOGo/UI/Mailer/common.h b/SOGo/UI/MailerUI/common.h
similarity index 100%
rename from SOGo/UI/Mailer/common.h
rename to SOGo/UI/MailerUI/common.h

diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/MailerUI/mailer.css
similarity index 100%
rename from SOGo/UI/Mailer/mailer.css
rename to SOGo/UI/MailerUI/mailer.css

diff --git a/SOGo/UI/Mailer/mailer.js b/SOGo/UI/MailerUI/mailer.js
similarity index 100%
rename from SOGo/UI/Mailer/mailer.js
rename to SOGo/UI/MailerUI/mailer.js

diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/MailerUI/product.plist
similarity index 100%
rename from SOGo/UI/Mailer/product.plist
rename to SOGo/UI/MailerUI/product.plist

diff --git a/SOGo/UI/Mailer/screenshots/tbird_073_accountview.png b/SOGo/UI/MailerUI/screenshots/tbird_073_accountview.png
similarity index 100%
rename from SOGo/UI/Mailer/screenshots/tbird_073_accountview.png
rename to SOGo/UI/MailerUI/screenshots/tbird_073_accountview.png

diff --git a/SOGo/UI/Mailer/screenshots/tbird_073_compose.png b/SOGo/UI/MailerUI/screenshots/tbird_073_compose.png
similarity index 100%
rename from SOGo/UI/Mailer/screenshots/tbird_073_compose.png
rename to SOGo/UI/MailerUI/screenshots/tbird_073_compose.png

diff --git a/SOGo/UI/Mailer/screenshots/tbird_073_mailwelcome.png b/SOGo/UI/MailerUI/screenshots/tbird_073_mailwelcome.png
similarity index 100%
rename from SOGo/UI/Mailer/screenshots/tbird_073_mailwelcome.png
rename to SOGo/UI/MailerUI/screenshots/tbird_073_mailwelcome.png

diff --git a/SOGo/UI/Mailer/screenshots/tbird_073_settings.png b/SOGo/UI/MailerUI/screenshots/tbird_073_settings.png
similarity index 100%
rename from SOGo/UI/Mailer/screenshots/tbird_073_settings.png
rename to SOGo/UI/MailerUI/screenshots/tbird_073_settings.png

diff --git a/SOGo/UI/Mailer/screenshots/tbird_073_viewer.png b/SOGo/UI/MailerUI/screenshots/tbird_073_viewer.png
similarity index 100%
rename from SOGo/UI/Mailer/screenshots/tbird_073_viewer.png
rename to SOGo/UI/MailerUI/screenshots/tbird_073_viewer.png

diff --git a/SOGo/UI/Mailer/uix.css b/SOGo/UI/MailerUI/uix.css
similarity index 100%
rename from SOGo/UI/Mailer/uix.css
rename to SOGo/UI/MailerUI/uix.css

diff --git a/SOGo/UI/Templates/Mailer/UIxMailToolbar.wox b/SOGo/UI/Templates/MailerUI/UIxMailToolbar.wox
similarity index 100%
rename from SOGo/UI/Templates/Mailer/UIxMailToolbar.wox
rename to SOGo/UI/Templates/MailerUI/UIxMailToolbar.wox

diff --git a/SOGo/UI/Templates/Mailer/UIxMailTree.wox b/SOGo/UI/Templates/MailerUI/UIxMailTree.wox
similarity index 100%
rename from SOGo/UI/Templates/Mailer/UIxMailTree.wox
rename to SOGo/UI/Templates/MailerUI/UIxMailTree.wox