1 files changed, 48 insertions, 66 deletions

diff --git a/mail/nextcloud-mail/pkg-plist b/mail/nextcloud-mail/pkg-plist
index eaa3d83e7c1c..b4bc368acacb 100644
--- a/mail/nextcloud-mail/pkg-plist
+++ b/mail/nextcloud-mail/pkg-plist
@@ -5,7 +5,7 @@
 %%WWWDIR%%/appinfo/info.xml
 %%WWWDIR%%/appinfo/routes.php
 %%WWWDIR%%/css/mail.scss
-%%WWWDIR%%/css/mobile.css
+%%WWWDIR%%/css/mobile.scss
 %%WWWDIR%%/css/redirect.css
 %%WWWDIR%%/doc/admin.md
 %%WWWDIR%%/doc/developer.md
@@ -25,6 +25,8 @@
 %%WWWDIR%%/img/favicon.ico
 %%WWWDIR%%/img/favicon.png
 %%WWWDIR%%/img/favicon.svg
+%%WWWDIR%%/img/forward.png
+%%WWWDIR%%/img/forward.svg
 %%WWWDIR%%/img/inbox.png
 %%WWWDIR%%/img/inbox.svg
 %%WWWDIR%%/img/junk.png
@@ -33,6 +35,8 @@
 %%WWWDIR%%/img/mail-notification.svg
 %%WWWDIR%%/img/mail.png
 %%WWWDIR%%/img/mail.svg
+%%WWWDIR%%/img/reply-all.png
+%%WWWDIR%%/img/reply-all.svg
 %%WWWDIR%%/img/reply.png
 %%WWWDIR%%/img/reply.svg
 %%WWWDIR%%/img/sent.png
@@ -41,20 +45,30 @@
 %%WWWDIR%%/img/star.svg
 %%WWWDIR%%/img/trash.png
 %%WWWDIR%%/img/trash.svg
-%%WWWDIR%%/js/mail.0.6ce2f80c2027f14be564.js
-%%WWWDIR%%/js/mail.0.6ce2f80c2027f14be564.js.map
-%%WWWDIR%%/js/mail.2.1b6fb4e83e09aa280c13.js
-%%WWWDIR%%/js/mail.2.1b6fb4e83e09aa280c13.js.map
-%%WWWDIR%%/js/mail.3.c2b981da60db282fe3f8.js
-%%WWWDIR%%/js/mail.3.c2b981da60db282fe3f8.js.map
-%%WWWDIR%%/js/mail.4.04b932b281f838b1df32.js
-%%WWWDIR%%/js/mail.4.04b932b281f838b1df32.js.map
-%%WWWDIR%%/js/mail.5.ec020a6b20aa0a8e45f1.js
-%%WWWDIR%%/js/mail.5.ec020a6b20aa0a8e45f1.js.map
-%%WWWDIR%%/js/mail.6.b4ffce53931e0bae8b96.js
-%%WWWDIR%%/js/mail.6.b4ffce53931e0bae8b96.js.map
-%%WWWDIR%%/js/mail.7.ad4c2f17ee2f96a2d5c0.js
-%%WWWDIR%%/js/mail.7.ad4c2f17ee2f96a2d5c0.js.map
+%%WWWDIR%%/js/autoredirect.js
+%%WWWDIR%%/js/autoredirect.js.map
+%%WWWDIR%%/js/mail.0.2934359dee0db61cafb4.js
+%%WWWDIR%%/js/mail.0.2934359dee0db61cafb4.js.map
+%%WWWDIR%%/js/mail.1.89e20adb107b116b0245.js
+%%WWWDIR%%/js/mail.1.89e20adb107b116b0245.js.map
+%%WWWDIR%%/js/mail.10.9e957f5fe855556d39bf.js
+%%WWWDIR%%/js/mail.10.9e957f5fe855556d39bf.js.map
+%%WWWDIR%%/js/mail.11.053d67c0d57da54e5a76.js
+%%WWWDIR%%/js/mail.11.053d67c0d57da54e5a76.js.map
+%%WWWDIR%%/js/mail.12.e3e00695349d8f15e664.js
+%%WWWDIR%%/js/mail.12.e3e00695349d8f15e664.js.map
+%%WWWDIR%%/js/mail.2.0019071dac5b3e7f366c.js
+%%WWWDIR%%/js/mail.2.0019071dac5b3e7f366c.js.map
+%%WWWDIR%%/js/mail.3.267ecd61e1b68beda317.js
+%%WWWDIR%%/js/mail.3.267ecd61e1b68beda317.js.map
+%%WWWDIR%%/js/mail.6.bf7d096deaeca264d32e.js
+%%WWWDIR%%/js/mail.6.bf7d096deaeca264d32e.js.map
+%%WWWDIR%%/js/mail.7.d83f31f794a5a7e2db6a.js
+%%WWWDIR%%/js/mail.7.d83f31f794a5a7e2db6a.js.map
+%%WWWDIR%%/js/mail.8.cd26ebe52e05019c801c.js
+%%WWWDIR%%/js/mail.8.cd26ebe52e05019c801c.js.map
+%%WWWDIR%%/js/mail.9.9b5833b23d7be196850d.js
+%%WWWDIR%%/js/mail.9.9b5833b23d7be196850d.js.map
 %%WWWDIR%%/js/mail.js
 %%WWWDIR%%/js/mail.js.map
 %%WWWDIR%%/l10n/.gitkeep
@@ -154,8 +168,6 @@
 %%WWWDIR%%/l10n/ja.json
 %%WWWDIR%%/l10n/ka_GE.js
 %%WWWDIR%%/l10n/ka_GE.json
-%%WWWDIR%%/l10n/km.js
-%%WWWDIR%%/l10n/km.json
 %%WWWDIR%%/l10n/ko.js
 %%WWWDIR%%/l10n/ko.json
 %%WWWDIR%%/l10n/lt_LT.js
@@ -170,8 +182,6 @@
 %%WWWDIR%%/l10n/nb.json
 %%WWWDIR%%/l10n/nl.js
 %%WWWDIR%%/l10n/nl.json
-%%WWWDIR%%/l10n/nn_NO.js
-%%WWWDIR%%/l10n/nn_NO.json
 %%WWWDIR%%/l10n/oc.js
 %%WWWDIR%%/l10n/oc.json
 %%WWWDIR%%/l10n/pl.js
@@ -201,18 +211,15 @@
 %%WWWDIR%%/l10n/tr.json
 %%WWWDIR%%/l10n/uk.js
 %%WWWDIR%%/l10n/uk.json
-%%WWWDIR%%/l10n/vi.js
-%%WWWDIR%%/l10n/vi.json
 %%WWWDIR%%/l10n/zh_CN.js
 %%WWWDIR%%/l10n/zh_CN.json
-%%WWWDIR%%/l10n/zh_HK.js
-%%WWWDIR%%/l10n/zh_HK.json
 %%WWWDIR%%/l10n/zh_TW.js
 %%WWWDIR%%/l10n/zh_TW.json
 %%WWWDIR%%/lib/Account.php
 %%WWWDIR%%/lib/Address.php
 %%WWWDIR%%/lib/AddressList.php
 %%WWWDIR%%/lib/AppInfo/Application.php
+%%WWWDIR%%/lib/AppInfo/BootstrapSingleton.php
 %%WWWDIR%%/lib/Attachment.php
 %%WWWDIR%%/lib/Cache/Cache.php
 %%WWWDIR%%/lib/Command/CreateAccount.php
@@ -220,6 +227,7 @@
 %%WWWDIR%%/lib/Contracts/IAttachmentService.php
 %%WWWDIR%%/lib/Contracts/IAvatarService.php
 %%WWWDIR%%/lib/Contracts/IMailManager.php
+%%WWWDIR%%/lib/Contracts/IMailSearch.php
 %%WWWDIR%%/lib/Contracts/IMailTransmission.php
 %%WWWDIR%%/lib/Contracts/IUserPreferences.php
 %%WWWDIR%%/lib/Controller/AccountsController.php
@@ -242,6 +250,10 @@
 %%WWWDIR%%/lib/Db/MailAccountMapper.php
 %%WWWDIR%%/lib/Db/Mailbox.php
 %%WWWDIR%%/lib/Db/MailboxMapper.php
+%%WWWDIR%%/lib/Events/BeforeMessageDeletedEvent.php
+%%WWWDIR%%/lib/Events/DraftSavedEvent.php
+%%WWWDIR%%/lib/Events/MessageSentEvent.php
+%%WWWDIR%%/lib/Events/SaveDraftEvent.php
 %%WWWDIR%%/lib/Exception/AttachmentNotFoundException.php
 %%WWWDIR%%/lib/Exception/ClientException.php
 %%WWWDIR%%/lib/Exception/NotImplemented.php
@@ -251,10 +263,8 @@
 %%WWWDIR%%/lib/HordeTranslationHandler.php
 %%WWWDIR%%/lib/Http/AttachmentDownloadResponse.php
 %%WWWDIR%%/lib/Http/AvatarDownloadResponse.php
-%%WWWDIR%%/lib/Http/CacheHeaders.php
 %%WWWDIR%%/lib/Http/HtmlResponse.php
 %%WWWDIR%%/lib/Http/JSONErrorResponse.php
-%%WWWDIR%%/lib/Http/JSONResponse.php
 %%WWWDIR%%/lib/Http/Middleware/ErrorMiddleware.php
 %%WWWDIR%%/lib/Http/ProxyDownloadResponse.php
 %%WWWDIR%%/lib/IMAP/FolderMapper.php
@@ -262,12 +272,23 @@
 %%WWWDIR%%/lib/IMAP/IMAPClientFactory.php
 %%WWWDIR%%/lib/IMAP/MailboxSync.php
 %%WWWDIR%%/lib/IMAP/MessageMapper.php
+%%WWWDIR%%/lib/IMAP/Search/FullScanSearchStrategy.php
+%%WWWDIR%%/lib/IMAP/Search/ISearchStrategy.php
+%%WWWDIR%%/lib/IMAP/Search/ImapSortSearchStrategy.php
+%%WWWDIR%%/lib/IMAP/Search/SearchFilterStringParser.php
+%%WWWDIR%%/lib/IMAP/Search/SearchStrategyFactory.php
 %%WWWDIR%%/lib/IMAP/Sync/FavouritesMailboxSync.php
 %%WWWDIR%%/lib/IMAP/Sync/ISyncStrategy.php
 %%WWWDIR%%/lib/IMAP/Sync/Request.php
 %%WWWDIR%%/lib/IMAP/Sync/Response.php
 %%WWWDIR%%/lib/IMAP/Sync/SimpleMailboxSync.php
 %%WWWDIR%%/lib/IMAP/Sync/Synchronizer.php
+%%WWWDIR%%/lib/Listener/AddressCollectionListener.php
+%%WWWDIR%%/lib/Listener/DeleteDraftListener.php
+%%WWWDIR%%/lib/Listener/DraftMailboxCreatorListener.php
+%%WWWDIR%%/lib/Listener/FlagRepliedMessageListener.php
+%%WWWDIR%%/lib/Listener/SaveSentMessageListener.php
+%%WWWDIR%%/lib/Listener/TrashMailboxCreatorListener.php
 %%WWWDIR%%/lib/Mailbox.php
 %%WWWDIR%%/lib/Migration/FixCollectedAddresses.php
 %%WWWDIR%%/lib/Migration/Version0100Date20180825194217.php
@@ -278,16 +299,15 @@
 %%WWWDIR%%/lib/Migration/Version0161Date20190902103559.php
 %%WWWDIR%%/lib/Migration/Version0161Date20190902103701.php
 %%WWWDIR%%/lib/Migration/Version0161Date20190902114635.php
+%%WWWDIR%%/lib/Migration/Version0180Date20190927124207.php
 %%WWWDIR%%/lib/Model/ConvertAddresses.php
 %%WWWDIR%%/lib/Model/IMAPMessage.php
 %%WWWDIR%%/lib/Model/IMessage.php
 %%WWWDIR%%/lib/Model/Message.php
 %%WWWDIR%%/lib/Model/NewMessageData.php
 %%WWWDIR%%/lib/Model/RepliedMessageData.php
-%%WWWDIR%%/lib/Model/ReplyMessage.php
 %%WWWDIR%%/lib/SMTP/SmtpClientFactory.php
 %%WWWDIR%%/lib/SearchFolder.php
-%%WWWDIR%%/lib/SearchHelper.php
 %%WWWDIR%%/lib/SearchMailbox.php
 %%WWWDIR%%/lib/Service/AccountService.php
 %%WWWDIR%%/lib/Service/AliasesService.php
@@ -332,6 +352,7 @@
 %%WWWDIR%%/lib/Service/HtmlPurify/TransformURLScheme.php
 %%WWWDIR%%/lib/Service/IMailBox.php
 %%WWWDIR%%/lib/Service/MailManager.php
+%%WWWDIR%%/lib/Service/MailSearch.php
 %%WWWDIR%%/lib/Service/MailTransmission.php
 %%WWWDIR%%/lib/Service/SetupService.php
 %%WWWDIR%%/lib/Service/UserPreferenceSevice.php
@@ -982,45 +1003,6 @@
 %%WWWDIR%%/vendor/gravatarphp/gravatar/README.md
 %%WWWDIR%%/vendor/gravatarphp/gravatar/composer.json
 %%WWWDIR%%/vendor/gravatarphp/gravatar/src/Gravatar.php
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/00changelog.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/branch
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/cache/branch2-base
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/cache/rbc-names-v1
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/cache/rbc-revs-v1
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/dirstate
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/hgrc
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/requires
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/00changelog.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/00manifest.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/_r_e_a_d_m_e.rst.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/_url_linker-example.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/_url_linker.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/composer.json.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/lib/_url_linker.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/lib/_url_linker_interface.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/lib/valid_tlds.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/phpunit-logging.xml.dist.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/phpunit.xml.dist.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/tests/_url_linker_escaping_html_test.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/tests/_url_linker_in_trusted_html_test.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/tests/_url_linker_test.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/tests/_url_linker_test_case.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/tests/bootstrap.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/tests/functions/_html_escape_and_link_urls_test.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/tests/functions/_link_urls_in_trusted_html_test.php.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/data/~2ehgignore.i
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/fncache
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/phaseroots
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/undo
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/undo.backupfiles
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/store/undo.phaseroots
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/undo.bookmarks
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/undo.branch
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/undo.desc
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/undo.dirstate
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/wcache/checkisexec
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/wcache/checklink
-%%WWWDIR%%/vendor/kwi/urllinker/.hg/wcache/checklink-target
 %%WWWDIR%%/vendor/kwi/urllinker/.hgignore
 %%WWWDIR%%/vendor/kwi/urllinker/README.rst
 %%WWWDIR%%/vendor/kwi/urllinker/UrlLinker-example.php