Other: Release Bridge Iron v1.7.0

Add patched libqcocoa based on Qt 5.13.0

.golangci.yml

@@ -1,3 +1,4 @@
+---
 run:
   timeout: 10m
   build-tags:
@@ -8,9 +9,11 @@ run:
 issues:
   exclude-use-default: false
   exclude:
-     - Using the variable on range scope `tt` in function literal
-     - should have comment (\([^)]+\) )?or be unexported # For now we are missing a lot of comments.
-     - at least one file in a package should have a package comment # For now we are missing a lot of comments.
+    - Using the variable on range scope `tt` in function literal
+    # For now we are missing a lot of comments.
+    - should have comment (\([^)]+\) )?or be unexported
+    # For now we are missing a lot of comments.
+    - at least one file in a package should have a package comment
 
   exclude-rules:
     - path: _test\.go
@@ -30,7 +33,7 @@ linters-settings:
 linters:
   # setting disable-all will make only explicitly enabled linters run
   disable-all: true
-  
+
   enable:
     - deadcode          # Finds unused code [fast: true, auto-fix: false]
     - errcheck          # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: true, auto-fix: false]
@@ -49,7 +52,6 @@ linters:
     - funlen            # Tool for detection of long functions [fast: true, auto-fix: false]
     - gochecknoglobals  # Checks that no globals are present in Go code [fast: true, auto-fix: false]
     - gochecknoinits    # Checks that no init functions are present in Go code [fast: true, auto-fix: false]
-    #- gocognit          # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
     - goconst           # Finds repeated strings that could be replaced by a constant [fast: true, auto-fix: false]
     - gocritic          # The most opinionated Go source code linter [fast: true, auto-fix: false]
     - gocyclo           # Computes and checks the cyclomatic complexity of functions [fast: true, auto-fix: false]
@@ -58,15 +60,52 @@ linters:
     - goimports         # Goimports does everything that gofmt does. Additionally it checks unused imports [fast: true, auto-fix: true]
     - golint            # Golint differs from gofmt. Gofmt reformats Go source code, whereas golint prints out style mistakes [fast: true, auto-fix: false]
     - gosec             # Inspects source code for security problems [fast: true, auto-fix: false]
-    - interfacer        # Linter that suggests narrower interface types [fast: true, auto-fix: false]
-    - maligned          # Tool to detect Go structs that would take less memory if their fields were sorted [fast: true, auto-fix: false]
     - misspell          # Finds commonly misspelled English words in comments [fast: true, auto-fix: true]
     - nakedret          # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
     - prealloc          # Finds slice declarations that could potentially be preallocated [fast: true, auto-fix: false]
-    - scopelint         # Scopelint checks for unpinned variables in go programs [fast: true, auto-fix: false]
     - stylecheck        # Stylecheck is a replacement for golint [fast: true, auto-fix: false]
     - unconvert         # Remove unnecessary type conversions [fast: true, auto-fix: false]
     - unparam           # Reports unused function parameters [fast: true, auto-fix: false]
     - whitespace        # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
-    #- wsl               # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
-    #- lll               # Reports long lines [fast: true, auto-fix: false]
+    - asciicheck        # Simple linter to check that your code does not contain non-ASCII identifiers [fast: true, auto-fix: false]
+    - durationcheck     # check for two durations multiplied together [fast: false, auto-fix: false]
+    - exhaustive        # check exhaustiveness of enum switch statements [fast: false, auto-fix: false]
+    - exportloopref     # checks for pointers to enclosing loop variables [fast: false, auto-fix: false]
+    - forcetypeassert   # finds forced type assertions [fast: true, auto-fix: false]
+    - godot             # Check if comments end in a period [fast: true, auto-fix: true]
+    - goheader          # Checks is file header matches to pattern [fast: true, auto-fix: false]
+    - gomodguard        # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations. [fast: true, auto-fix: false]
+    - goprintffuncname  # Checks that printf-like functions are named with `f` at the end [fast: true, auto-fix: false]
+    - importas          # Enforces consistent import aliases [fast: false, auto-fix: false]
+    - makezero          # Finds slice declarations with non-zero initial length [fast: false, auto-fix: false]
+    - nilerr            # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
+    - predeclared       # find code that shadows one of Go's predeclared identifiers [fast: true, auto-fix: false]
+    - revive            # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint. [fast: false, auto-fix: false]
+    - rowserrcheck      # checks whether Err of rows is checked successfully [fast: false, auto-fix: false]
+    - sqlclosecheck     # Checks that sql.Rows and sql.Stmt are closed. [fast: false, auto-fix: false]
+    - tparallel         # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes [fast: false, auto-fix: false]
+    - wastedassign      # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
+    # - wsl               # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
+    # - lll               # Reports long lines [fast: true, auto-fix: false]
+    # Consider to include:
+    # - gocognit          # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
+    # - cyclop            # checks function and package cyclomatic complexity [fast: false, auto-fix: false]
+    # - errorlint         # go-errorlint is a source code linter for Go software that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13. [fast: false, auto-fix: false]
+    # - exhaustivestruct  # Checks if all struct's fields are initialized [fast: false, auto-fix: false]
+    # - forbidigo         # Forbids identifiers [fast: true, auto-fix: false]
+    # - gci               # Gci control golang package import order and make it always deterministic. [fast: true, auto-fix: true]
+    # - gocognit          # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
+    # - goerr113          # Golang linter to check the errors handling expressions [fast: false, auto-fix: false]
+    # - gofumpt           # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
+    # - gomnd             # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
+    # - gomoddirectives   # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod. [fast: true, auto-fix: false]
+    # - ifshort           # Checks that your code uses short syntax for if-statements whenever possible [fast: true, auto-fix: false]
+    # - nestif            # Reports deeply nested if statements [fast: true, auto-fix: false]
+    # - nlreturn          # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false]
+    # - noctx             # noctx finds sending http request without context.Context [fast: false, auto-fix: false]
+    # - nolintlint        # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false]
+    # - paralleltest      # paralleltest detects missing usage of t.Parallel() method in your Go test [fast: true, auto-fix: false]
+    # - testpackage       # linter that makes you use a separate _test package [fast: true, auto-fix: false]
+    # - thelper           # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers [fast: false, auto-fix: false]
+    # - wrapcheck         # Checks that errors returned from external packages are wrapped [fast: false, auto-fix: false]
+

Changelog.md

@@ -2,6 +2,106 @@
 
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
+## [Bridge 1.7.0] Iron
+
+### Added
+* GODT-213 New message builder:
+    * Preserve Content-Type for undecryptable message body.
+    * Use application/octet-stream for encrypted parts.
+    * Force no transfer encoding for embedded message/rfc822 parts.
+    * Remove dead code GetRelatedHeader/GetRelatedBoundary.
+    * Correctly expect text/plain in custom message text parts.
+    * Force text/plain for custom message text part.
+    * Complex external encrypted tests (multipart/alternative, message/rfc822 attachment).
+
+### Fixed
+* GODT-1136 DB Cache header from builder and test.
+* GODT-1113 Fix tray icon size on macOS Big Sur.
+* GODT-947 Force colors in logs.
+
+
+## [Bridge 1.6.9] HZM
+
+### Fixed
+* GODT-1121 'Keep the application up to date' switches off after restarting Bridge.
+
+
+## [Bridge 1.6.8] HZM
+
+### Fixed
+* GODT-1120 Use Info level in internal/app logs.
+
+
+## [IE 1.3.3] Farg
+
+### Fixed
+* GODT-1120 Use Info level in internal/app logs.
+
+
+## [Bridge 1.6.7] HZM
+
+### Added
+* GODT-1111 Add correct metadata to Windows executables.
+* GODT-1112 Add application to Windows Firewall exclusion list on install.
+* GODT-1077 Track how many times message is built to help understand re-syncs.
+
+### Changed
+* GODT-247 Revise all storage locations (cache, config, local etc).
+
+### Fixed
+* GODT-948 Parser does not handle embedding of Content-Type: message/rfc822.
+* GODT-1079 Correct 9001 error handling on login.
+
+### Security
+* GODT-1105 Dylib Hijacking security fix.
+
+
+## [IE 1.3.2] Farg
+
+### Added
+* GODT-1111 Add correct metadata to Windows executables.
+* GODT-1112 Add application to Windows Firewall exclusion list on install.
+
+### Changed
+* GODT-247 Revise all storage locations (cache, config, local etc).
+
+### Fixed
+* GODT-1079 Correct 9001 error handling on login.
+
+### Security
+* GODT-1105 Dylib Hijacking security fix.
+
+
+## [IE 1.3.1] Farg
+
+### Changed
+* GODT-1047 No silent updates for Import-Export app.
+* GODT-247 Cache and update files moved from user's cache to config.
+
+### Fixed
+* Other: include latest go.mod/go.sum changes.
+* GODT-803 Fix import to wrong target address.
+* GODT-948 Embedded messages.
+* GODT-1043 Fix showing long login error in GUI dialog.
+
+
+## [Bridge 1.6.6] HZM
+
+### Added
+* Other: QA build checks for update every 5 minutes.
+* Other: QA build adds debug message dump when sending.
+
+### Changed
+* GODT-1045 build without Qt by default.
+
+### Fixed
+* GODT-1029 Fix tray icon not updating under certain conditions.
+* GODT-1062 Fix lost notification bar when window is closed.
+* GODT-1058 Install version after chaning channel right away only in case of downgrade.
+* GODT-1073 Re-write autostart link on every start if turned on in preferences.
+* GODT-1055 Fix flaky empty trash test.
+
+
 ## [Bridge 1.6.5] HZM
 
 ### Changed

Makefile

@@ -10,8 +10,8 @@ TARGET_OS?=${GOOS}
 .PHONY: build build-ie build-nogui build-ie-nogui build-launcher build-launcher-ie  versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=1.6.5+git
-IE_APP_VERSION?=1.3.0+git
+BRIDGE_APP_VERSION?=1.7.0+git
+IE_APP_VERSION?=1.3.3+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 SRC_ICO:=logo.ico
 SRC_ICNS:=Bridge.icns
@@ -19,6 +19,7 @@ SRC_SVG:=logo.svg
 TGT_ICNS:=Bridge.icns
 EXE_NAME:=proton-bridge
 CONFIGNAME:=bridge
+WINDRES_DEFINE:=BUILD_BRIDGE
 ifeq "${TARGET_CMD}" "Import-Export"
     APP_VERSION:=${IE_APP_VERSION}
     SRC_ICO:=ie.ico
@@ -27,13 +28,14 @@ ifeq "${TARGET_CMD}" "Import-Export"
     TGT_ICNS:=ImportExport.icns
     EXE_NAME:=proton-ie
     CONFIGNAME:=importExport
+	WINDRES_DEFINE:=BUILD_IE
 endif
 REVISION:=$(shell git rev-parse --short=10 HEAD)
 BUILD_TIME:=$(shell date +%FT%T%z)
 
 BUILD_FLAGS:=-tags='${BUILD_TAGS}'
 BUILD_FLAGS_LAUNCHER:=${BUILD_FLAGS}
-BUILD_FLAGS_NOGUI:=-tags='${BUILD_TAGS} nogui'
+BUILD_FLAGS_GUI:=-tags='${BUILD_TAGS} build_qt'
 GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/internal/constants.,Version=${APP_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
 ifneq "${BUILD_LDFLAGS}" ""
     GO_LDFLAGS+=${BUILD_LDFLAGS}
@@ -45,7 +47,7 @@ ifeq "${TARGET_OS}" "windows"
 endif
 
 BUILD_FLAGS+=-ldflags '${GO_LDFLAGS}'
-BUILD_FLAGS_NOGUI+=-ldflags '${GO_LDFLAGS}'
+BUILD_FLAGS_GUI+=-ldflags '${GO_LDFLAGS}'
 BUILD_FLAGS_LAUNCHER+=-ldflags '${GO_LDFLAGS_LAUNCHER}'
 
 DEPLOY_DIR:=cmd/${TARGET_CMD}/deploy
@@ -56,7 +58,7 @@ EXE_QT:=${DIRNAME}
 ifeq "${TARGET_OS}" "windows"
     EXE:=${EXE}.exe
     EXE_QT:=${EXE_QT}.exe
-    ICO_FILES:=${SRC_ICO} icon.rc icon_windows.syso
+    RESOURCE_FILE:=resource.syso
 endif
 ifeq "${TARGET_OS}" "darwin"
     DARWINAPP_CONTENTS:=${DEPLOY_DIR}/darwin/${EXE}.app/Contents
@@ -84,13 +86,19 @@ build-ie:
 	TARGET_CMD=Import-Export $(MAKE) build
 
 build-nogui: gofiles
-	go build ${BUILD_FLAGS_NOGUI} -o ${EXE_NAME} cmd/${TARGET_CMD}/main.go
+	go build ${BUILD_FLAGS} -o ${EXE_NAME} cmd/${TARGET_CMD}/main.go
 
 build-ie-nogui:
 	TARGET_CMD=Import-Export $(MAKE) build-nogui
 
-build-launcher:
-	go build ${BUILD_FLAGS_LAUNCHER} -o launcher-${APP} cmd/launcher/main.go
+ifeq "${GOOS}" "windows"
+  	PRERESOURCECMD:=cp ./resource.syso ./cmd/launcher/resource.syso
+	POSTRESOURCECMD:=rm -f ./cmd/launcher/resource.syso
+endif
+build-launcher: ${RESOURCE_FILE}
+	${PRERESOURCECMD}
+	go build ${BUILD_FLAGS_LAUNCHER} -o launcher-${EXE} ./cmd/launcher/
+	${POSTRESOURCECMD}
 
 build-launcher-ie:
 	TARGET_CMD=Import-Export $(MAKE) build-launcher
@@ -134,21 +142,20 @@ ifneq "${GOOS}" "${TARGET_OS}"
   endif
 endif
 
-${EXE_TARGET}: check-has-go gofiles ${ICO_FILES} ${VENDOR_TARGET}
+${EXE_TARGET}: check-has-go gofiles ${RESOURCE_FILE} ${VENDOR_TARGET}
 	rm -rf deploy ${TARGET_OS} ${DEPLOY_DIR}
 	cp cmd/${TARGET_CMD}/main.go .
-	qtdeploy ${BUILD_FLAGS} ${QT_BUILD_TARGET}
+	qtdeploy ${BUILD_FLAGS_GUI} ${QT_BUILD_TARGET}
 	mv deploy cmd/${TARGET_CMD}
 	if [ "${EXE_QT_TARGET}" != "${EXE_TARGET}" ]; then mv ${EXE_QT_TARGET} ${EXE_TARGET}; fi
 	rm -rf ${TARGET_OS} main.go
 
-logo.ico ie.ico: ./internal/frontend/share/icons/${SRC_ICO}
-	cp $^ $@
-icon.rc: ./internal/frontend/share/icon.rc
-	cp $^ .
-icon_windows.syso: icon.rc logo.ico
-	windres --target=pe-x86-64 -o $@ $<
 
+WINDRES_YEAR:=$(shell date +%Y)
+APP_VERSION_COMMA:=$(shell echo "${APP_VERSION}" | sed -e 's/[^0-9,.]*//g' -e 's/\./,/g')
+resource.syso: ./internal/frontend/share/info.rc ./internal/frontend/share/icons/${SRC_ICO} .FORCE
+	rm -f ./*.syso
+	windres --target=pe-x86-64 -I ./internal/frontend/share/icons/ -D ${WINDRES_DEFINE} -D ICO_FILE=${SRC_ICO} -D EXE_NAME="${EXE_NAME}" -D FILE_VERSION="${APP_VERSION}" -D ORIGINAL_FILE_NAME="${EXE}" -D PRODUCT_VERSION="${APP_VERSION}" -D FILE_VERSION_COMMA=${APP_VERSION_COMMA} -D YEAR=${WINDRES_YEAR} -o $@ $<
 
 ## Rules for therecipe/qt
 .PHONY: prepare-vendor update-vendor update-qt-docs
@@ -158,6 +165,7 @@ THERECIPE_ENV:=github.com/therecipe/env_${TARGET_OS}_amd64_513
 # therecipe/env in order to download it only once
 vendor-cache/${THERECIPE_ENV}:
 	git clone https://${THERECIPE_ENV}.git vendor-cache/${THERECIPE_ENV}
+	if [ "${TARGET_OS}" == "darwin" ]; then cp -f "./utils/QTBUG-88600/libqcocoa.dylib" "./vendor-cache/${THERECIPE_ENV}/5.13.0/clang_64/plugins/platforms/"; fi;
 
 # The command used to make symlinks is different on windows.
 # So if the GOOS is windows and we aren't crossbuilding (in which case the host os would still be *nix)
@@ -181,7 +189,7 @@ update-qt-docs:
 
 ## Dev dependencies
 .PHONY: install-devel-tools install-linter install-go-mod-outdated install-git-hooks
-LINTVER:="v1.29.0"
+LINTVER:="v1.39.0"
 LINTSRC:="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh"
 
 install-dev-dependencies: install-devel-tools install-linter install-go-mod-outdated
@@ -250,6 +258,7 @@ mocks:
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/transfer PanicHandler,ClientManager,IMAPClientProvider > internal/transfer/mocks/mocks.go
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/store PanicHandler,ClientManager,BridgeUser,ChangeNotifier > internal/store/mocks/mocks.go
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/listener Listener > internal/store/mocks/utils_mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/message Fetcher > pkg/message/mocks/mocks.go
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/pmapi Client > pkg/pmapi/mocks/mocks.go
 
 lint: gofiles lint-golang lint-license lint-changelog
@@ -294,6 +303,7 @@ LOG?=debug
 LOG_IMAP?=client # client/server/all, or empty to turn it off
 LOG_SMTP?=--log-smtp # empty to turn it off
 RUN_FLAGS?=-m -l=${LOG} --log-imap=${LOG_IMAP} ${LOG_SMTP}
+RUN_FLAGS_IE?=-m -l=${LOG}
 
 run: run-nogui-cli
 
@@ -303,12 +313,12 @@ run-qt-cli: ${EXE_TARGET}
 	PROTONMAIL_ENV=dev ./$< ${RUN_FLAGS} -c
 
 run-nogui: clean-vendor gofiles
-	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS_NOGUI} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} | tee last.log
+	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} | tee last.log
 run-nogui-cli: clean-vendor gofiles
-	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS_NOGUI} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} -c
+	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} -c
 
 run-debug:
-	PROTONMAIL_ENV=dev dlv debug --build-flags "${BUILD_FLAGS_NOGUI}" cmd/${TARGET_CMD}/main.go -- ${RUN_FLAGS}
+	PROTONMAIL_ENV=dev dlv debug --build-flags "${BUILD_FLAGS}" cmd/${TARGET_CMD}/main.go -- ${RUN_FLAGS}
 
 run-qml-preview:
 	$(MAKE) -C internal/frontend/qt -f Makefile.local qmlpreview
@@ -316,11 +326,11 @@ run-ie-qml-preview:
 	$(MAKE) -C internal/frontend/qt-ie -f Makefile.local qmlpreview
 
 run-ie:
-	TARGET_CMD=Import-Export $(MAKE) run
+	TARGET_CMD=Import-Export RUN_FLAGS="${RUN_FLAGS_IE}" $(MAKE) run
 run-ie-qt:
-	TARGET_CMD=Import-Export $(MAKE) run-qt
+	TARGET_CMD=Import-Export RUN_FLAGS="${RUN_FLAGS_IE}" $(MAKE) run-qt
 run-ie-nogui:
-	TARGET_CMD=Import-Export $(MAKE) run-nogui
+	TARGET_CMD=Import-Export RUN_FLAGS="${RUN_FLAGS_IE}" $(MAKE) run-nogui
 
 clean-frontend-qt:
 	$(MAKE) -C internal/frontend/qt -f Makefile.local clean
@@ -337,7 +347,7 @@ clean: clean-vendor
 	rm -rf cmd/Desktop-Bridge/deploy
 	rm -rf cmd/Import-Export/deploy
 	rm -f build last.log mem.pprof main.go
-	rm -rf logo.ico icon.rc icon_windows.syso internal/frontend/qt/icon_windows.syso
+	rm -f resource.syso
 	rm -f release-notes/bridge.html
 	rm -f release-notes/import-export.html
 
@@ -345,3 +355,5 @@ clean: clean-vendor
 generate:
 	go generate ./...
 	$(MAKE) add-license
+
+.FORCE:

go.mod

@@ -54,7 +54,6 @@ require (
 	github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce
 	github.com/olekukonko/tablewriter v0.0.4 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/pkg/math v0.0.0-20141027224758-f2ed9e40e245
 	github.com/sirupsen/logrus v1.7.0
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect

go.sum

@@ -223,8 +223,6 @@ github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTw
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/math v0.0.0-20141027224758-f2ed9e40e245 h1:gk/AF9SGRj+RafNCoDcS3RRscb8S4BVbvqODOgWA7/8=
-github.com/pkg/math v0.0.0-20141027224758-f2ed9e40e245/go.mod h1:2dhPPj2Li3DXrSY2U2ADdZy2B7sjQsT57lqENx1+FSE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=

internal/app/base/base.go

@@ -69,7 +69,7 @@ const (
 	flagMemProfileShort = "m"
 	flagLogLevel        = "log-level"
 	flagLogLevelShort   = "l"
-	// FlagCLI indicate to start with command line interface
+	// FlagCLI indicate to start with command line interface.
 	FlagCLI      = "cli"
 	flagCLIShort = "c"
 	flagRestart  = "restart"

internal/app/base/migration.go

@@ -29,10 +29,12 @@ import (
 // migrateFiles migrates files from their old (pre-refactor) locations to their new locations.
 // We can remove this eventually.
 //
-// | entity |               old location                |            new location                |
-// |--------|-------------------------------------------|----------------------------------------|
-// | prefs  | ~/.cache/protonmail/<app>/c11/prefs.json  | ~/.config/protonmail/<app>/prefs.json  |
-// | c11    | ~/.cache/protonmail/<app>/c11             | ~/.cache/protonmail/<app>/cache/c11    |
+// | entity    |               old location                |            new location                |
+// |-----------|-------------------------------------------|----------------------------------------|
+// | prefs     | ~/.cache/protonmail/<app>/c11/prefs.json  | ~/.config/protonmail/<app>/prefs.json  |
+// | c11 1.5.x | ~/.cache/protonmail/<app>/c11             | ~/.cache/protonmail/<app>/cache/c11    |
+// | c11 1.6.x | ~/.cache/protonmail/<app>/cache/c11       | ~/.config/protonmail/<app>/cache/c11   |
+// | updates   | ~/.cache/protonmail/<app>/updates         | ~/.config/protonmail/<app>/updates     |.
 func migrateFiles(configName string) error {
 	locationsProvider, err := locations.NewDefaultProvider(filepath.Join(constants.VendorName, configName))
 	if err != nil {
@@ -41,43 +43,89 @@ func migrateFiles(configName string) error {
 
 	locations := locations.New(locationsProvider, configName)
 	userCacheDir := locationsProvider.UserCache()
+
+	if err := migratePrefsFrom15x(locations, userCacheDir); err != nil {
+		return err
+	}
+	if err := migrateCacheFromBoth15xAnd16x(locations, userCacheDir); err != nil {
+		return err
+	}
+	if err := migrateUpdatesFrom16x(configName, locations); err != nil { //nolint[revive] It is more clear to structure this way
+		return err
+	}
+	return nil
+}
+
+func migratePrefsFrom15x(locations *locations.Locations, userCacheDir string) error {
 	newSettingsDir, err := locations.ProvideSettingsPath()
 	if err != nil {
 		return err
 	}
 
-	if err := moveIfExists(
+	return moveIfExists(
 		filepath.Join(userCacheDir, "c11", "prefs.json"),
 		filepath.Join(newSettingsDir, "prefs.json"),
-	); err != nil {
-		return err
-	}
+	)
+}
 
-	newCacheDir, err := locations.ProvideCachePath()
+func migrateCacheFromBoth15xAnd16x(locations *locations.Locations, userCacheDir string) error {
+	olderCacheDir := userCacheDir
+	newerCacheDir := locations.GetOldCachePath()
+	latestCacheDir, err := locations.ProvideCachePath()
 	if err != nil {
 		return err
 	}
 
+	// Migration for versions before 1.6.x.
 	if err := moveIfExists(
-		filepath.Join(userCacheDir, "c11"),
-		filepath.Join(newCacheDir, "c11"),
+		filepath.Join(olderCacheDir, "c11"),
+		filepath.Join(latestCacheDir, "c11"),
 	); err != nil {
 		return err
 	}
 
-	return nil
+	// Migration for versions 1.6.x.
+	return moveIfExists(
+		filepath.Join(newerCacheDir, "c11"),
+		filepath.Join(latestCacheDir, "c11"),
+	)
+}
+
+func migrateUpdatesFrom16x(configName string, locations *locations.Locations) error {
+	// In order to properly update Bridge 1.6.X and higher we need to
+	// change the launcher first. Since this is not part of automatic
+	// updates the migration must wait until manual update. Until that
+	// we need to keep old path.
+	if configName == "bridge" {
+		return nil
+	}
+
+	oldUpdatesPath := locations.GetOldUpdatesPath()
+	// Do not use ProvideUpdatesPath, that creates dir right away.
+	newUpdatesPath := locations.GetUpdatesPath()
+
+	return moveIfExists(oldUpdatesPath, newUpdatesPath)
 }
 
 func moveIfExists(source, destination string) error {
+	l := logrus.WithField("source", source).WithField("destination", destination)
+
 	if _, err := os.Stat(source); os.IsNotExist(err) {
-		logrus.WithField("source", source).WithField("destination", destination).Debug("No need to migrate file")
+		l.Info("No need to migrate file, source doesn't exist")
 		return nil
 	}
 
 	if _, err := os.Stat(destination); !os.IsNotExist(err) {
-		logrus.WithField("source", source).WithField("destination", destination).Debug("No need to migrate file")
+		// Once migrated, files should not stay in source anymore. Therefore
+		// if some files are still in source location but target already exist,
+		// it's suspicious. Could happen by installing new version, then the
+		// old one because of some reason, and then the new one again.
+		// Good to see as warning because it could be a reason why Bridge is
+		// behaving weirdly, like wrong configuration, or db re-sync and so on.
+		l.Warn("No need to migrate file, target already exists")
 		return nil
 	}
 
+	l.Info("Migrating files")
 	return os.Rename(source, destination)
 }

internal/app/bridge/bridge.go

@@ -139,7 +139,7 @@ func run(b *base.Base, c *cli.Context) error { // nolint[funlen]
 
 	// Watch for updates routine
 	go func() {
-		ticker := time.NewTicker(time.Hour)
+		ticker := time.NewTicker(constants.UpdateCheckInterval)
 
 		for {
 			checkAndHandleUpdate(b.Updater, f, b.Settings.GetBool(settings.AutoUpdateKey))
@@ -189,9 +189,10 @@ func generateTLSCerts(b *base.Base) error {
 }
 
 func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool) {
+	log := logrus.WithField("pkg", "app/bridge")
 	version, err := u.Check()
 	if err != nil {
-		logrus.WithError(err).Error("An error occurred while checking for updates")
+		log.WithError(err).Error("An error occurred while checking for updates")
 		return
 	}
 
@@ -201,11 +202,11 @@ func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool)
 	f.SetVersion(version)
 
 	if !u.IsUpdateApplicable(version) {
-		logrus.Debug("No need to update")
+		log.Info("No need to update")
 		return
 	}
 
-	logrus.WithField("version", version.Version).Info("An update is available")
+	log.WithField("version", version.Version).Info("An update is available")
 
 	if !autoUpdate {
 		f.NotifyManualUpdate(version, u.CanInstall(version))
@@ -213,16 +214,16 @@ func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool)
 	}
 
 	if !u.CanInstall(version) {
-		logrus.Info("A manual update is required")
+		log.Info("A manual update is required")
 		f.NotifySilentUpdateError(updater.ErrManualUpdateRequired)
 		return
 	}
 
 	if err := u.InstallUpdate(version); err != nil {
 		if errors.Cause(err) == updater.ErrDownloadVerify {
-			logrus.WithError(err).Warning("Skipping update installation due to temporary error")
+			log.WithError(err).Warning("Skipping update installation due to temporary error")
 		} else {
-			logrus.WithError(err).Error("The update couldn't be installed")
+			log.WithError(err).Error("The update couldn't be installed")
 			f.NotifySilentUpdateError(err)
 		}
 

internal/app/ie/ie.go

@@ -28,8 +28,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/internal/frontend"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
 	"github.com/ProtonMail/proton-bridge/internal/importexport"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
@@ -88,10 +86,11 @@ func run(b *base.Base, c *cli.Context) error {
 	return f.Loop()
 }
 
-func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool) {
+func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool) { //nolint[unparam]
+	log := logrus.WithField("pkg", "app/ie")
 	version, err := u.Check()
 	if err != nil {
-		logrus.WithError(err).Error("An error occurred while checking for updates")
+		log.WithError(err).Error("An error occurred while checking for updates")
 		return
 	}
 
@@ -101,33 +100,11 @@ func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool)
 	f.SetVersion(version)
 
 	if !u.IsUpdateApplicable(version) {
-		logrus.Debug("No need to update")
+		log.Info("No need to update")
 		return
 	}
 
-	logrus.WithField("version", version.Version).Info("An update is available")
+	log.WithField("version", version.Version).Info("An update is available")
 
-	if !autoUpdate {
-		f.NotifyManualUpdate(version, u.CanInstall(version))
-		return
-	}
-
-	if !u.CanInstall(version) {
-		logrus.Info("A manual update is required")
-		f.NotifySilentUpdateError(updater.ErrManualUpdateRequired)
-		return
-	}
-
-	if err := u.InstallUpdate(version); err != nil {
-		if errors.Cause(err) == updater.ErrDownloadVerify {
-			logrus.WithError(err).Warning("Skipping update installation due to temporary error")
-		} else {
-			logrus.WithError(err).Error("The update couldn't be installed")
-			f.NotifySilentUpdateError(err)
-		}
-
-		return
-	}
-
-	f.NotifySilentUpdateInstalled()
+	f.NotifyManualUpdate(version, u.CanInstall(version))
 }

internal/bridge/bridge.go

@@ -151,28 +151,33 @@ func (b *Bridge) GetUpdateChannel() updater.UpdateChannel {
 // Downgrading to previous version (by switching from early to stable, for example)
 // requires clearing all data including update files due to possibility of
 // inconsistency between versions and absence of backwards migration scripts.
-func (b *Bridge) SetUpdateChannel(channel updater.UpdateChannel) error {
+func (b *Bridge) SetUpdateChannel(channel updater.UpdateChannel) (needRestart bool, err error) {
 	b.settings.Set(settings.UpdateChannelKey, string(channel))
 
 	version, err := b.updater.Check()
 	if err != nil {
-		return err
+		return false, err
 	}
 
-	if b.updater.IsDowngrade(version) {
-		if err := b.Users.ClearData(); err != nil {
-			log.WithError(err).Error("Failed to clear data while downgrading channel")
-		}
-		if err := b.locations.ClearUpdates(); err != nil {
-			log.WithError(err).Error("Failed to clear updates while downgrading channel")
-		}
+	// We have to deal right away only with downgrade - that action needs to
+	// clear data and updates, and install bridge right away. But regular
+	// upgrade can be leaved out for periodic check.
+	if !b.updater.IsDowngrade(version) {
+		return false, nil
+	}
+
+	if err := b.Users.ClearData(); err != nil {
+		log.WithError(err).Error("Failed to clear data while downgrading channel")
+	}
+	if err := b.locations.ClearUpdates(); err != nil {
+		log.WithError(err).Error("Failed to clear updates while downgrading channel")
 	}
 
 	if err := b.updater.InstallUpdate(version); err != nil {
-		return err
+		return false, err
 	}
 
-	return b.versioner.RemoveOtherVersions(version.Version)
+	return true, b.versioner.RemoveOtherVersions(version.Version)
 }
 
 // GetKeychainApp returns current keychain helper.

internal/config/settings/settings.go

@@ -78,7 +78,7 @@ func (s *Settings) setDefaultValues() {
 	s.setDefault(ReportOutgoingNoEncKey, "false")
 	s.setDefault(LastVersionKey, "")
 	s.setDefault(UpdateChannelKey, "")
-	s.setDefault(RolloutKey, fmt.Sprintf("%v", rand.Float64()))
+	s.setDefault(RolloutKey, fmt.Sprintf("%v", rand.Float64())) //nolint[gosec] G404 It is OK to use weak random number generator here
 	s.setDefault(PreferredKeychainKey, "")
 
 	s.setDefault(APIPortKey, DefaultAPIPort)

internal/config/tls/tls.go

@@ -122,11 +122,7 @@ func (t *TLS) GenerateCerts(template *x509.Certificate) error {
 	}
 	defer keyOut.Close() // nolint[errcheck]
 
-	if err := pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}); err != nil {
-		return err
-	}
-
-	return nil
+	return pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
 }
 
 // GetConfig tries to load TLS config or generate new one which is then returned.
@@ -148,6 +144,7 @@ func (t *TLS) GetConfig() (*tls.Config, error) {
 	caCertPool := x509.NewCertPool()
 	caCertPool.AddCert(c.Leaf)
 
+	// nolint[gosec]: We need to support older TLS versions for AppleMail and Outlook.
 	return &tls.Config{
 		Certificates: []tls.Certificate{c},
 		ServerName:   "127.0.0.1",

internal/constants/update_default.go

@@ -15,18 +15,14 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-package imap
+// +build !build_qa
 
-import (
-	"io"
-	"net/http"
-	"net/textproto"
+package constants
+
+import "time"
+
+// nolint[gochecknoglobals]
+var (
+	// UpdateCheckInterval defines how often we check for new version
+	UpdateCheckInterval = time.Hour //nolint[gochecknoglobals]
 )
-
-func writeHeader(w io.Writer, h textproto.MIMEHeader) (err error) {
-	if err = http.Header(h).Write(w); err != nil {
-		return
-	}
-	_, err = io.WriteString(w, "\r\n")
-	return
-}

internal/constants/update_qa.go

@@ -0,0 +1,28 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// +build build_qa
+
+package constants
+
+import "time"
+
+// nolint[gochecknoglobals]
+var (
+	// UpdateCheckInterval defines how often we check for new version
+	UpdateCheckInterval = time.Duration(5 * time.Minute)
+)

internal/frontend/autoconfig/applemail.go

@@ -93,7 +93,7 @@ func (c *appleMail) Configure(imapPort, smtpPort int, imapSSL, smtpSSL bool, use
 	})()
 
 	// Make sure the file is only readable for the current user.
-	f, err := os.OpenFile(filepath.Join(dir, "protonmail.mobileconfig"), os.O_RDWR|os.O_CREATE, 0600)
+	f, err := os.OpenFile(filepath.Clean(filepath.Join(dir, "protonmail.mobileconfig")), os.O_RDWR|os.O_CREATE, 0600)
 	if err != nil {
 		return err
 	}

internal/frontend/cli-ie/accounts.go

@@ -25,7 +25,7 @@ import (
 
 func (f *frontendCLI) listAccounts(c *ishell.Context) {
 	spacing := "%-2d: %-20s (%-15s, %-15s)\n"
-	f.Printf(bold(strings.Replace(spacing, "d", "s", -1)), "#", "account", "status", "address mode")
+	f.Printf(bold(strings.ReplaceAll(spacing, "d", "s")), "#", "account", "status", "address mode")
 	for idx, user := range f.ie.GetUsers() {
 		connected := "disconnected"
 		if user.IsConnected() {

internal/frontend/cli-ie/importexport.go

@@ -38,7 +38,7 @@ func (f *frontendCLI) importLocalMessages(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetLocalImporter(user.GetPrimaryAddress(), path)
+	t, err := f.ie.GetLocalImporter(user.Username(), user.GetPrimaryAddress(), path)
 	f.transfer(t, err, false, true)
 }
 
@@ -68,7 +68,7 @@ func (f *frontendCLI) importRemoteMessages(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetRemoteImporter(user.GetPrimaryAddress(), username, password, host, port)
+	t, err := f.ie.GetRemoteImporter(user.Username(), user.GetPrimaryAddress(), username, password, host, port)
 	f.transfer(t, err, false, true)
 }
 
@@ -81,7 +81,7 @@ func (f *frontendCLI) exportMessagesToEML(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetEMLExporter(user.GetPrimaryAddress(), path)
+	t, err := f.ie.GetEMLExporter(user.Username(), user.GetPrimaryAddress(), path)
 	f.transfer(t, err, true, false)
 }
 
@@ -94,7 +94,7 @@ func (f *frontendCLI) exportMessagesToMBOX(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetMBOXExporter(user.GetPrimaryAddress(), path)
+	t, err := f.ie.GetMBOXExporter(user.Username(), user.GetPrimaryAddress(), path)
 	f.transfer(t, err, true, false)
 }
 

internal/frontend/cli/accounts.go

@@ -28,7 +28,7 @@ import (
 
 func (f *frontendCLI) listAccounts(c *ishell.Context) {
 	spacing := "%-2d: %-20s (%-15s, %-15s)\n"
-	f.Printf(bold(strings.Replace(spacing, "d", "s", -1)), "#", "account", "status", "address mode")
+	f.Printf(bold(strings.ReplaceAll(spacing, "d", "s")), "#", "account", "status", "address mode")
 	for idx, user := range f.bridge.GetUsers() {
 		connected := "disconnected"
 		if user.IsConnected() {

internal/frontend/cli/system.go

@@ -161,7 +161,7 @@ func (f *frontendCLI) disallowProxy(c *ishell.Context) {
 }
 
 func (f *frontendCLI) isPortFree(port string) bool {
-	port = strings.Replace(port, ":", "", -1)
+	port = strings.ReplaceAll(port, ":", "")
 	if port == "" || port == currentPort {
 		return true
 	}

internal/frontend/cli/updates.go

@@ -81,9 +81,13 @@ func (f *frontendCLI) selectEarlyChannel(c *ishell.Context) {
 	f.Println("Bridge is currently on the stable update channel.")
 
 	if f.yesNoQuestion("Are you sure you want to switch to the early-access update channel") {
-		if err := f.bridge.SetUpdateChannel(updater.EarlyChannel); err != nil {
+		needRestart, err := f.bridge.SetUpdateChannel(updater.EarlyChannel)
+		if err != nil {
 			f.Println("There was a problem switching update channel.")
 		}
+		if needRestart {
+			f.restarter.SetToRestart()
+		}
 	}
 }
 
@@ -97,9 +101,12 @@ func (f *frontendCLI) selectStableChannel(c *ishell.Context) {
 	f.Println("Switching to the stable channel may reset all data!")
 
 	if f.yesNoQuestion("Are you sure you want to switch to the stable update channel") {
-		if err := f.bridge.SetUpdateChannel(updater.StableChannel); err != nil {
+		needRestart, err := f.bridge.SetUpdateChannel(updater.StableChannel)
+		if err != nil {
 			f.Println("There was a problem switching update channel.")
 		}
-		f.restarter.SetToRestart()
+		if needRestart {
+			f.restarter.SetToRestart()
+		}
 	}
 }

internal/frontend/qml/BridgeUI/DialogYesNo.qml

@@ -229,7 +229,7 @@ Dialog {
                 currentIndex : 0
                 title        : qsTr("Clear cache", "title of page that displays during cache clearing")
                 question     : qsTr("Are you sure you want to clear your local cache?", "displays during cache clearing")
-                note         : qsTr("This will delete all of your stored preferences as well as cached email data for all accounts, temporarily slowing down the email download process significantly.", "displays during cache clearing")
+                note         : qsTr("This will delete all of your stored preferences as well as cached email data for all accounts, and requires you to reconfigure your client.", "displays during cache clearing")
                 answer       : qsTr("Clearing the cache ...", "displays during cache clearing")
             }
         },
@@ -310,7 +310,7 @@ Dialog {
                 target: root
                 currentIndex : 0
                 question     : qsTr("Are you sure you want to leave early access? Please keep in mind this operation clears the cache and restarts Bridge.")
-                note         : qsTr("This will delete all of your stored preferences as well as cached email data for all accounts, temporarily slowing down the email download process significantly.")
+                note         : qsTr("This will delete all of your stored preferences as well as cached email data for all accounts, and requires you to reconfigure your client.")
                 title        : qsTr("Disable early access")
                 answer       : qsTr("Disabling early access...")
             }

internal/frontend/qml/Gui.qml

@@ -107,17 +107,53 @@ Item {
             gui.openMainWindow(false)
             if (go.isConnectionOK) {
                 if( winMain.updateState=="noInternet") {
-                    go.setUpdateState("upToDate")
+                    go.updateState = "upToDate"
                 }
             } else {
-                go.setUpdateState("noInternet")
+                go.updateState = "noInternet"
             }
         }
 
-        onSetUpdateState : {
+        onUpdateStateChanged : {
+            // Update tray icon if needed
+            switch (go.updateState) {
+                case "internetCheck":
+                    break;
+                case "noInternet" :
+                    gui.warningFlags |= Style.warnInfoBar
+                    break;
+                case "oldVersion":
+                    gui.warningFlags |= Style.warnInfoBar
+                    break;
+                case "forceUpdate":
+                    // Force update should presist once it happened and never be overwritten.
+                    // That means that tray icon should allways remain in error state.
+                    // But since we have only two sources of error icon in tray (force update 
+                    // + installation fail) and both are unrecoverable and we do not ever remove
+                    // error flag from gui.warningFlags - it is ok to rely on gui.warningFlags and
+                    // not on winMain.updateState (which presist forceUpdate)
+                    gui.warningFlags |= Style.errorInfoBar
+                    break;
+                case "upToDate":
+                    gui.warningFlags &= ~Style.warnInfoBar
+                    break;
+                case "updateRestart":
+                    gui.warningFlags |= Style.warnInfoBar
+                    break;
+                case "updateError":
+                    gui.warningFlags |= Style.errorInfoBar
+                    break;
+                default :
+                    break;
+            }
+
+            // if main window is closed - most probably it is destroyed (see closeMainWindow())
+            if (winMain == null) {
+                return
+            }
             // once app is outdated prevent from state change
             if (winMain.updateState != "forceUpdate") {
-                winMain.updateState = updateState
+                winMain.updateState = go.updateState
             }
         }
 
@@ -129,15 +165,14 @@ Item {
         }
 
         onNotifyManualUpdate: {
-            go.setUpdateState("oldVersion")
+            go.updateState = "oldVersion"
         }
 
         onNotifyManualUpdateRestartNeeded: {
             if (!winMain.dialogUpdate.visible) {
-                gui.openMainWindow(true)
                 winMain.dialogUpdate.show()
             }
-            go.setUpdateState("updateRestart")
+            go.updateState = "updateRestart"
             winMain.dialogUpdate.finished(false)
 
             // after manual update - just retart immidiatly
@@ -147,28 +182,25 @@ Item {
 
         onNotifyManualUpdateError: {
             if (!winMain.dialogUpdate.visible) {
-                gui.openMainWindow(true)
                 winMain.dialogUpdate.show()
             }
-            go.setUpdateState("updateError")
+            go.updateState = "updateError"
             winMain.dialogUpdate.finished(true)
         }
 
         onNotifyForceUpdate : {
-            go.setUpdateState("forceUpdate")
+            go.updateState = "forceUpdate"
             if (!winMain.dialogUpdate.visible) {
-                gui.openMainWindow(true)
                 winMain.dialogUpdate.show()
             }
         }
 
         onNotifySilentUpdateRestartNeeded: {
-            go.setUpdateState("updateRestart")
+            go.updateState = "updateRestart"
         }
 
         onNotifySilentUpdateError: {
-            go.setUpdateState("updateError")
-            gui.openMainWindow(true)
+            go.updateState = "updateError"
         }
 
         onNotifyLogout : {
@@ -287,9 +319,17 @@ Item {
         if (showAndRise) {
             gui.winMain.showAndRise()
         }
+
+        // restore update notification bar: trigger updateStateChanged
+        var tmp = go.updateState
+        go.updateState = ""
+        go.updateState = tmp
     }
 
     function closeMainWindow () {
+        // Historical reasons: once upon a time there was a report about high GPU
+        // usage on MacOS while bridge is closed. Legends say that destroying 
+        // MainWindow solved this.
         gui.winMain.hide()
         gui.winMain.destroy(5000)
         gui.winMain = null

internal/frontend/qml/GuiIE.qml

@@ -30,7 +30,6 @@ Item {
     id: gui
     property alias winMain: winMain
     property bool isFirstWindow: true
-    property int warningFlags: 0
 
     property var locale    : Qt.locale("en_US")
     property date netBday  : new Date("1989-03-13T00:00:00")
@@ -96,17 +95,17 @@ Item {
             go.isConnectionOK = isAvailable
             if (go.isConnectionOK) {
                 if( winMain.updateState==gui.enums.statusNoInternet) {
-                    go.setUpdateState(gui.enums.statusUpToDate)
+                    go.updateState = gui.enums.statusUpToDate
                 }
             } else {
-                go.setUpdateState(gui.enums.statusNoInternet)
+                go.updateState = gui.enums.statusNoInternet
             }
         }
 
-        onSetUpdateState : {
+        onUpdateStateChanged : {
             // once app is outdated prevent from state change
             if (winMain.updateState != "forceUpdate") {
-                winMain.updateState = updateState
+                winMain.updateState = go.updateState
             }
         }
 
@@ -207,16 +206,16 @@ Item {
         }
 
         onNotifyManualUpdate: {
-            go.setUpdateState("oldVersion")
+            go.updateState = "oldVersion"
         }
 
         onNotifyManualUpdateRestartNeeded: {
             if (!winMain.dialogUpdate.visible) {
                 winMain.dialogUpdate.show()
             }
-            go.setUpdateState("updateRestart")
+            go.updateState = "updateRestart"
             winMain.dialogUpdate.finished(false)
-
+        
             // after manual update - just retart immidiatly
             go.setToRestart()
             Qt.quit()
@@ -226,24 +225,24 @@ Item {
             if (!winMain.dialogUpdate.visible) {
                 winMain.dialogUpdate.show()
             }
-            go.setUpdateState("updateError")
+            go.updateState = "updateError"
             winMain.dialogUpdate.finished(true)
         }
 
         onNotifyForceUpdate : {
-            go.setUpdateState("forceUpdate")
+            go.updateState = "forceUpdate"
             if (!winMain.dialogUpdate.visible) {
                 winMain.dialogUpdate.show()
             }
         }
 
-        onNotifySilentUpdateRestartNeeded: {
-            go.setUpdateState("updateRestart")
-        }
-
-        onNotifySilentUpdateError: {
-            go.setUpdateState("updateError")
-        }
+        //onNotifySilentUpdateRestartNeeded: {
+        //    go.updateState = "updateRestart"
+        //}
+        //
+        //onNotifySilentUpdateError: {
+        //    go.updateState = "updateError"
+        //}
 
         onNotifyLogout : {
             go.notifyBubble(0, qsTr("Account %1 has been disconnected. Please log in to continue to use the Import-Export app with this account.").arg(accname) )

internal/frontend/qml/ImportExportUI/AccountDelegate.qml

@@ -165,6 +165,7 @@ Column {
             textColor : Style.main.textBlue
             onClicked: {
                 dialogExport.currentIndex = 0
+                dialogExport.account = account
                 dialogExport.address = account
                 dialogExport.show()
             }
@@ -321,6 +322,7 @@ Column {
                         textBold: true
                         textColor: Style.main.textBlue
                         onClicked: {
+                            dialogExport.account = account
                             dialogExport.address = listalias[index]
                             dialogExport.show()
                         }
@@ -339,6 +341,7 @@ Column {
                         textBold: true
                         textColor: enabled ? Style.main.textBlue : Style.main.textDisabled
                         onClicked: {
+                            dialogImport.account = account
                             dialogImport.address = listalias[index]
                             dialogImport.show()
                         }

internal/frontend/qml/ImportExportUI/DialogExport.qml

@@ -35,6 +35,7 @@ Dialog {
 
     title : set_title()
 
+    property string account
     property string address
     property alias finish: finish
 
@@ -428,7 +429,7 @@ Dialog {
         onTriggered : {
             switch (currentIndex) {
                 case 0:
-                go.loadStructureForExport(root.address)
+                go.loadStructureForExport(root.account, root.address)
                 sourceFoldersInput.hasItems = (transferRules.rowCount() > 0)
                 break
                 case 2:

internal/frontend/qml/ImportExportUI/DialogImport.qml

@@ -34,6 +34,7 @@ Dialog {
 
     isDialogBusy: currentIndex==3 || currentIndex==4
 
+    property string account
     property string address
     property string inputPath  : ""
     property bool   isFromFile : inputEmail.text == "" && root.inputPath != ""
@@ -1032,6 +1033,7 @@ Dialog {
                     root.isFromIMAP,
                     root.inputPath,
                     inputEmail.text, inputPassword.text, inputServer.text, inputPort.text,
+                    root.account,
                     root.address
                 )
                 break

internal/frontend/qml/ImportExportUI/SettingsView.qml

@@ -96,6 +96,8 @@ Item {
                 onClicked: bugreportWin.show()
             }
 
+            /*
+
             ButtonIconText {
                 id: autoUpdates
                 text: qsTr("Keep the application up to date", "label for toggle that activates and disables the automatic updates")
@@ -115,8 +117,6 @@ Item {
                 }
             }
 
-            /*
-
              ButtonIconText {
                  id: cacheClear
                  text: qsTr("Clear Cache")

internal/frontend/qml/ProtonUI/Dialog.qml

@@ -18,6 +18,7 @@
 // Dialog with adding new user
 
 import QtQuick 2.8
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.3
 import ProtonUI 1.0
 
@@ -83,6 +84,9 @@ StackLayout {
             text : ""
             color: Style.main.textBlue
             visible: false
+            width: root.width
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: Text.WordWrap
         }
 
         // prevent any action below

internal/frontend/qml/ProtonUI/DialogAddUser.qml

@@ -70,7 +70,8 @@ Dialog {
             id: topSep
             color  : "transparent"
             width  : Style.main.dummy
-            height : root.height/2 - (dialogNameAndPassword.heightInputs)/2
+            // Hacky hack: +10 is to make title of Dialog bigger so longer error can fit just fine.
+            height : root.height/2 + 10 - (dialogNameAndPassword.heightInputs)/2
         }
 
         InputField {

internal/frontend/qml/ProtonUI/DialogUpdate.qml

@@ -107,7 +107,7 @@ Dialog {
                 text: qsTr("Automatically update in the future", "Checkbox label for using autoupdates later on")
                 checked: go.isAutoUpdate
                 onToggled: go.toggleAutoUpdate()
-                visible: !root.forceUpdate
+                visible: !root.forceUpdate && (go.isAutoUpdate != undefined)
             }
 
             Row {

internal/frontend/qml/ProtonUI/InformationBar.qml

@@ -108,31 +108,25 @@ Rectangle {
     onStateChanged : {
         switch (root.state) {
             case "internetCheck":
-            break;
+                break;
             case "noInternet" :
-            gui.warningFlags |= Style.warnInfoBar
-            retryInternet.start()
-            secLeft=checkInterval[iTry]
-            break;
+                retryInternet.start()
+                secLeft=checkInterval[iTry]
+                break;
             case "oldVersion":
-            gui.warningFlags |= Style.warnInfoBar
-            break;
+                break;
             case "forceUpdate":
-            gui.warningFlags |= Style.errorInfoBar
-            break;
+                break;
             case "upToDate":
-            gui.warningFlags &= ~Style.warnInfoBar
-            iTry = 0
-            secLeft=checkInterval[iTry]
-            break;
+                iTry = 0
+                secLeft=checkInterval[iTry]
+                break;
             case "updateRestart":
-            gui.warningFlags |= Style.warnInfoBar
-            break;
+                break;
             case "updateError":
-            gui.warningFlags |= Style.errorInfoBar
-            break;
+                break;
             default :
-            break;
+                break;
         }
 
         if (root.state!="noInternet") {
@@ -271,7 +265,7 @@ Rectangle {
                 target: closeSign
                 visible: true
                 onClicked: {
-                    root.state = "upToDate"
+                    go.updateState = "upToDate"
                 }
             }
         },

internal/frontend/qml/tst_Gui.qml

@@ -24,7 +24,7 @@ import QtQuick.Window 2.2
 
 Window {
     id: testroot
-    width   : 150
+    width   : 250
     height  : 600
     flags   : Qt.Window | Qt.Dialog | Qt.FramelessWindowHint
     visible : true
@@ -60,7 +60,7 @@ Window {
         Text {
             id: systrText
             anchors {
-                right : test_systray.right
+                horizontalCenter: parent.horizontalCenter
                 verticalCenter: test_systray.verticalCenter
             }
             text: "unset"
@@ -299,6 +299,7 @@ Window {
         property string fullversion : "QA.1.0 (d9f8sdf9) 2020-02-19T10:57:23+01:00"
         property string downloadLink: "https://protonmail.com/download/beta/protonmail-bridge-1.1.5-1.x86_64.rpm;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;"
 
+        property string updateState
         property string updateVersion : "QA.1.0"
         property bool updateCanInstall: true
         property string updateLandingPage : "https://protonmail.com/bridge/download/"
@@ -340,7 +341,6 @@ Window {
 
         signal notifyPortIssue(bool busyPortIMAP, bool busyPortSMTP)
         signal notifyVersionIsTheLatest()
-        signal setUpdateState(string updateState)
         signal notifyKeychainRebuild()
         signal notifyHasNoKeychain()
 

internal/frontend/qml/tst_GuiIE.qml

@@ -23,13 +23,13 @@ import QtQuick.Window 2.2
 
 Window {
     id      : testroot
-    width   : 100
+    width   : 150
     height  : 600
     flags   : Qt.Window | Qt.Dialog | Qt.FramelessWindowHint
     visible : true
     title   : "GUI test Window"
     color   : "transparent"
-    x       : testgui.winMain.x - 120
+    x       : testgui.winMain.x - 170
     y       : testgui.winMain.y
 
     property bool newVersion : true
@@ -110,8 +110,8 @@ Window {
         ListElement { title: "NotifyManualUpdateRestart" }
         ListElement { title: "NotifyManualUpdateError" }
         ListElement { title: "ForceUpdate" }
-        ListElement { title: "NotifySilentUpdateRestartNeeded" }
-        ListElement { title: "NotifySilentUpdateError" }
+        //ListElement { title: "NotifySilentUpdateRestartNeeded" }
+        //ListElement { title: "NotifySilentUpdateError" }
         ListElement { title : "ImportStructure"     }
         ListElement { title : "DraftImpFailed"      }
         ListElement { title : "NoInterImp"          }
@@ -183,12 +183,12 @@ Window {
                     case "ForceUpdate" :
                     go.notifyForceUpdate()
                     break;
-                    case "NotifySilentUpdateRestartNeeded" :
-                    go.notifySilentUpdateRestartNeeded()
-                    break;
-                    case "NotifySilentUpdateError" :
-                    go.notifySilentUpdateError()
-                    break;
+                    //case "NotifySilentUpdateRestartNeeded" :
+                    //go.notifySilentUpdateRestartNeeded()
+                    //break;
+                    //case "NotifySilentUpdateError" :
+                    //go.notifySilentUpdateError()
+                    //break;
                     case "ImportStructure" :
                     testgui.winMain.dialogImport.address = "cuto@pm.com"
                     testgui.winMain.dialogImport.show()
@@ -836,7 +836,7 @@ Window {
         id: go
 
         property int isAutoStart : 1
-        property bool isAutoUpdate : false
+        //property bool isAutoUpdate : false
         property bool isFirstStart : false
         property string currentAddress : "none"
         //property string goos : "windows"
@@ -856,16 +856,17 @@ Window {
         property string fullversion : "QA.1.0 (d9f8sdf9) 2020-02-19T10:57:23+01:00"
         property string downloadLink: "https://protonmail.com/download/beta/protonmail-bridge-1.1.5-1.x86_64.rpm;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;"
 
+        property string updateState
         property string updateVersion : "q0.1.0"
-        property bool updateCanInstall: true
+        property bool updateCanInstall: false
         property string updateLandingPage : "https://protonmail.com/import-export/download/"
         property string updateReleaseNotesLink  : "https://protonmail.com/download/ie/release_notes.html"
         signal notifyManualUpdate()
         signal notifyManualUpdateRestartNeeded()
         signal notifyManualUpdateError()
         signal notifyForceUpdate()
-        signal notifySilentUpdateRestartNeeded()
-        signal notifySilentUpdateError()
+        //signal notifySilentUpdateRestartNeeded()
+        //signal notifySilentUpdateError()
         function checkForUpdates() {
             console.log("checkForUpdates")
             go.notifyVersionIsTheLatest()
@@ -900,7 +901,6 @@ Window {
         signal showQuit()
 
         signal notifyVersionIsTheLatest()
-        signal setUpdateState(string updateState)
 
         signal showMainWin()
         signal hideMainWin()
@@ -1355,10 +1355,10 @@ Window {
             return !fname.includes("fail")
         }
 
-        onToggleAutoUpdate: {
-            workAndClose()
-            isAutoUpdate = (isAutoUpdate!=false) ? false : true
-            console.log (" Test: onToggleAutoUpdate "+isAutoUpdate)
-        }
+        //onToggleAutoUpdate: {
+        //    workAndClose()
+        //    isAutoUpdate = (isAutoUpdate!=false) ? false : true
+        //    console.log (" Test: onToggleAutoUpdate "+isAutoUpdate)
+        //}
     }
 }

internal/frontend/qt-common/account_model.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 

internal/frontend/qt-common/accounts.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 

internal/frontend/qt-common/common.cpp

@@ -1,4 +1,4 @@
-// +build !nogui
+// +build build_qt
 
 #include "common.h"
 #include "_cgo_export.h"

internal/frontend/qt-common/common.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 

internal/frontend/qt-common/notification.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 

internal/frontend/qt-ie/enums.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/error_list.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/export.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 
@@ -29,7 +29,7 @@ const (
 	TypeMBOX = "MBOX"
 )
 
-func (f *FrontendQt) LoadStructureForExport(addressOrID string) {
+func (f *FrontendQt) LoadStructureForExport(username, addressOrID string) {
 	errCode := errUnknownError
 	var err error
 	defer func() {
@@ -41,7 +41,7 @@ func (f *FrontendQt) LoadStructureForExport(addressOrID string) {
 		}
 	}()
 
-	if f.transfer, err = f.ie.GetEMLExporter(addressOrID, ""); err != nil {
+	if f.transfer, err = f.ie.GetEMLExporter(username, addressOrID, ""); err != nil {
 		// The only error can be problem to load PM user and address.
 		errCode = errPMLoadFailed
 		return

internal/frontend/qt-ie/folder_functions.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/folder_structure.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/folder_structure_test.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/frontend.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 
@@ -135,11 +135,11 @@ func (f *FrontendQt) SetVersion(version updater.VersionInfo) {
 }
 
 func (f *FrontendQt) NotifySilentUpdateInstalled() {
-	f.Qml.NotifySilentUpdateRestartNeeded()
+	//f.Qml.NotifySilentUpdateRestartNeeded()
 }
 
 func (f *FrontendQt) NotifySilentUpdateError(err error) {
-	f.Qml.NotifySilentUpdateError()
+	//f.Qml.NotifySilentUpdateError()
 }
 
 func (f *FrontendQt) watchEvents() {
@@ -245,11 +245,11 @@ func (f *FrontendQt) QtExecute(Procedure func(*FrontendQt) error) error {
 	f.Qml.SetCredits(importexport.Credits)
 	f.Qml.SetFullversion(f.buildVersion)
 
-	if f.settings.GetBool(settings.AutoUpdateKey) {
-		f.Qml.SetIsAutoUpdate(true)
-	} else {
-		f.Qml.SetIsAutoUpdate(false)
-	}
+	//if f.settings.GetBool(settings.AutoUpdateKey) {
+	//	f.Qml.SetIsAutoUpdate(true)
+	//} else {
+	//	f.Qml.SetIsAutoUpdate(false)
+	//}
 
 	go func() {
 		defer f.panicHandler.HandlePanic()
@@ -339,17 +339,17 @@ func (f *FrontendQt) sendBug(description, emailClient, address string) bool {
 	return true
 }
 
-func (f *FrontendQt) toggleAutoUpdate() {
-	defer f.Qml.ProcessFinished()
-
-	if f.settings.GetBool(settings.AutoUpdateKey) {
-		f.settings.SetBool(settings.AutoUpdateKey, false)
-		f.Qml.SetIsAutoUpdate(false)
-	} else {
-		f.settings.SetBool(settings.AutoUpdateKey, true)
-		f.Qml.SetIsAutoUpdate(true)
-	}
-}
+//func (f *FrontendQt) toggleAutoUpdate() {
+//	defer f.Qml.ProcessFinished()
+//
+//	if f.settings.GetBool(settings.AutoUpdateKey) {
+//		f.settings.SetBool(settings.AutoUpdateKey, false)
+//		f.Qml.SetIsAutoUpdate(false)
+//	} else {
+//		f.settings.SetBool(settings.AutoUpdateKey, true)
+//		f.Qml.SetIsAutoUpdate(true)
+//	}
+//}
 
 // checkInternet is almost idetical to bridge
 func (f *FrontendQt) checkInternet() {

internal/frontend/qt-ie/frontend_nogui.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build nogui
+// +build !build_qt
 
 package qtie
 

internal/frontend/qt-ie/import.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 
@@ -26,7 +26,7 @@ import (
 )
 
 // wrapper for QML
-func (f *FrontendQt) setupAndLoadForImport(isFromIMAP bool, sourcePath, sourceEmail, sourcePassword, sourceServer, sourcePort, targetAddress string) {
+func (f *FrontendQt) setupAndLoadForImport(isFromIMAP bool, sourcePath, sourceEmail, sourcePassword, sourceServer, sourcePort, targetUsername, targetAddress string) {
 	errCode := errUnknownError
 	var err error
 	defer func() {
@@ -39,7 +39,7 @@ func (f *FrontendQt) setupAndLoadForImport(isFromIMAP bool, sourcePath, sourceEm
 	}()
 
 	if isFromIMAP {
-		f.transfer, err = f.ie.GetRemoteImporter(targetAddress, sourceEmail, sourcePassword, sourceServer, sourcePort)
+		f.transfer, err = f.ie.GetRemoteImporter(targetUsername, targetAddress, sourceEmail, sourcePassword, sourceServer, sourcePort)
 		if err != nil {
 			switch {
 			case errors.Is(err, &transfer.ErrIMAPConnection{}):
@@ -54,7 +54,7 @@ func (f *FrontendQt) setupAndLoadForImport(isFromIMAP bool, sourcePath, sourceEm
 			return
 		}
 	} else {
-		f.transfer, err = f.ie.GetLocalImporter(targetAddress, sourcePath)
+		f.transfer, err = f.ie.GetLocalImporter(targetUsername, targetAddress, sourcePath)
 		if err != nil {
 			// The only error can be problem to load PM user and address.
 			errCode = errPMLoadFailed

internal/frontend/qt-ie/mbox.go

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/notification.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/path_status.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/transfer_rules.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 

internal/frontend/qt-ie/ui.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie
 
@@ -33,7 +33,7 @@ type GoQMLInterface struct {
 
 	_ func() `constructor:"init"`
 
-	_ bool   `property:"isAutoUpdate"`
+	//_ bool   `property:"isAutoUpdate"`
 	_ string `property:"currentAddress"`
 	_ string `property:"goos"`
 	_ string `property:"credits"`
@@ -53,6 +53,7 @@ type GoQMLInterface struct {
 	_ string `property:"fullversion"`
 	_ string `property:"downloadLink"`
 
+	_ string `property:"updateState"`
 	_ string `property:"updateVersion"`
 	_ bool   `property:"updateCanInstall"`
 	_ string `property:"updateLandingPage"`
@@ -61,8 +62,8 @@ type GoQMLInterface struct {
 	_ func() `signal:"notifyManualUpdateRestartNeeded"`
 	_ func() `signal:"notifyManualUpdateError"`
 	_ func() `signal:"notifyForceUpdate"`
-	_ func() `signal:"notifySilentUpdateRestartNeeded"`
-	_ func() `signal:"notifySilentUpdateError"`
+	//_ func() `signal:"notifySilentUpdateRestartNeeded"`
+	//_ func() `signal:"notifySilentUpdateError"`
 	_ func() `slot:"checkForUpdates"`
 	_ func() `slot:"checkAndOpenReleaseNotes"`
 	_ func() `signal:"openReleaseNotesExternally"`
@@ -76,9 +77,8 @@ type GoQMLInterface struct {
 	_ string `property:"credentialsNotRemoved"`
 	_ string `property:"versionCheckFailed"`
 	//
-	_ func(isAvailable bool)   `signal:"setConnectionStatus"`
-	_ func(updateState string) `signal:"setUpdateState"`
-	_ func()                   `slot:"checkInternet"`
+	_ func(isAvailable bool) `signal:"setConnectionStatus"`
+	_ func()                 `slot:"checkInternet"`
 
 	_ func() `slot:"setToRestart"`
 
@@ -93,7 +93,7 @@ type GoQMLInterface struct {
 
 	_ func() `signal:"showWindow"`
 
-	_ func() `slot:"toggleAutoUpdate"`
+	//_ func() `slot:"toggleAutoUpdate"`
 	_ func() `slot:"quit"`
 	_ func() `slot:"loadAccounts"`
 	_ func() `slot:"openLogs"`
@@ -108,14 +108,14 @@ type GoQMLInterface struct {
 
 	_ func(description, client, address string) bool                                       `slot:"sendBug"`
 	_ func(address string) bool                                                            `slot:"sendImportReport"`
-	_ func(address string)                                                                 `slot:"loadStructureForExport"`
+	_ func(username, address string)                                                       `slot:"loadStructureForExport"`
 	_ func() string                                                                        `slot:"leastUsedColor"`
 	_ func(username string, name string, color string, isLabel bool, sourceID string) bool `slot:"createLabelOrFolder"`
 	_ func(fpath, address, fileType string, attachEncryptedBody bool)                      `slot:"startExport"`
 	_ func(email string, importEncrypted bool)                                             `slot:"startImport"`
 	_ func()                                                                               `slot:"resetSource"`
 
-	_ func(isFromIMAP bool, sourcePath, sourceEmail, sourcePassword, sourceServe, sourcePort, targetAddress string) `slot:"setupAndLoadForImport"`
+	_ func(isFromIMAP bool, sourcePath, sourceEmail, sourcePassword, sourceServe, sourcePort, targetUsername, targetAddress string) `slot:"setupAndLoadForImport"`
 
 	_ string `property:"progressInit"`
 
@@ -162,7 +162,7 @@ func (s *GoQMLInterface) init() {}
 func (s *GoQMLInterface) SetFrontend(f *FrontendQt) {
 	s.ConnectQuit(f.App.Quit)
 
-	s.ConnectToggleAutoUpdate(f.toggleAutoUpdate)
+	//s.ConnectToggleAutoUpdate(f.toggleAutoUpdate)
 	s.ConnectLoadAccounts(f.Accounts.LoadAccounts)
 	s.ConnectOpenLogs(f.openLogs)
 	s.ConnectOpenDownloadLink(f.openDownloadLink)
@@ -207,4 +207,6 @@ func (s *GoQMLInterface) SetFrontend(f *FrontendQt) {
 	s.ConnectCheckPathStatus(CheckPathStatus)
 
 	s.ConnectEmitEvent(f.emitEvent)
+
+	s.ConnectStartManualUpdate(f.startManualUpdate)
 }

internal/frontend/qt/accountModel.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qt
 

internal/frontend/qt/accounts.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qt
 
@@ -84,7 +84,7 @@ func (s *FrontendQt) clearCache() {
 
 	channel := s.bridge.GetUpdateChannel()
 	if channel == updater.EarlyChannel {
-		if err := s.bridge.SetUpdateChannel(updater.StableChannel); err != nil {
+		if _, err := s.bridge.SetUpdateChannel(updater.StableChannel); err != nil {
 			s.Qml.NotifyManualUpdateError()
 			return
 		}

internal/frontend/qt/frontend.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 // Package qt is the Qt User interface for Desktop bridge.
 //
@@ -340,46 +340,45 @@ func (s *FrontendQt) qtExecute(Procedure func(*FrontendQt) error) error {
 	s.Qml.SetCredits(bridge.Credits)
 	s.Qml.SetFullversion(s.buildVersion)
 
-	// Autostart.
-	if s.Qml.IsFirstStart() {
-		if s.autostart.IsEnabled() {
+	// Autostart: rewrite the current definition of autostart
+	//  - when it is the first time
+	//  - when starting after clear cache
+	//  - when there is already autostart file from past
+	//
+	//  This will make sure that autostart will use the latest path to
+	//  launcher or bridge.
+	isAutoStartEnabled := s.autostart.IsEnabled()
+	if s.Qml.IsFirstStart() || isAutoStartEnabled {
+		if isAutoStartEnabled {
 			if err := s.autostart.Disable(); err != nil {
-				log.Error("First disable ", err)
+				log.
+					WithField("first", s.Qml.IsFirstStart()).
+					WithField("wasEnabled", isAutoStartEnabled).
+					WithError(err).
+					Error("Disable on start failed.")
 				s.autostartError(err)
 			}
 		}
-		s.toggleAutoStart()
-	}
-	if s.autostart.IsEnabled() {
-		s.Qml.SetIsAutoStart(true)
-	} else {
-		s.Qml.SetIsAutoStart(false)
+		if err := s.autostart.Enable(); err != nil {
+			log.
+				WithField("first", s.Qml.IsFirstStart()).
+				WithField("wasEnabled", isAutoStartEnabled).
+				WithError(err).
+				Error("Enable on start failed.")
+			s.autostartError(err)
+		}
 	}
+	s.Qml.SetIsAutoStart(s.autostart.IsEnabled())
 
-	if s.settings.GetBool(settings.AutoUpdateKey) {
-		s.Qml.SetIsAutoUpdate(true)
-	} else {
-		s.Qml.SetIsAutoUpdate(false)
-	}
-
-	if s.settings.GetBool(settings.AllowProxyKey) {
-		s.Qml.SetIsProxyAllowed(true)
-	} else {
-		s.Qml.SetIsProxyAllowed(false)
-	}
-
-	if updater.UpdateChannel(s.settings.Get(settings.UpdateChannelKey)) == updater.EarlyChannel {
-		s.Qml.SetIsEarlyAccess(true)
-	} else {
-		s.Qml.SetIsEarlyAccess(false)
-	}
+	s.Qml.SetIsAutoUpdate(s.settings.GetBool(settings.AutoUpdateKey))
+	s.Qml.SetIsProxyAllowed(s.settings.GetBool(settings.AllowProxyKey))
+	s.Qml.SetIsEarlyAccess(updater.UpdateChannel(s.settings.Get(settings.UpdateChannelKey)) == updater.EarlyChannel)
 
 	availableKeychain := []string{}
 	for chain := range keychain.Helpers {
 		availableKeychain = append(availableKeychain, chain)
 	}
 	s.Qml.SetAvailableKeychain(availableKeychain)
-
 	s.Qml.SetSelectedKeychain(s.settings.Get(settings.PreferredKeychainKey))
 
 	// Set reporting of outgoing email without encryption.
@@ -557,20 +556,22 @@ func (s *FrontendQt) configureAppleMail(iAccount, iAddress int) {
 func (s *FrontendQt) toggleAutoStart() {
 	defer s.Qml.ProcessFinished()
 	var err error
-	if s.autostart.IsEnabled() {
+	wasEnabled := s.autostart.IsEnabled()
+	if wasEnabled {
 		err = s.autostart.Disable()
 	} else {
 		err = s.autostart.Enable()
 	}
+	isEnabled := s.autostart.IsEnabled()
 	if err != nil {
-		log.Error("Enable autostart: ", err)
+		log.
+			WithField("wasEnabled", wasEnabled).
+			WithField("isEnabled", isEnabled).
+			WithError(err).
+			Error("Autostart change failed.")
 		s.autostartError(err)
 	}
-	if s.autostart.IsEnabled() {
-		s.Qml.SetIsAutoStart(true)
-	} else {
-		s.Qml.SetIsAutoStart(false)
-	}
+	s.Qml.SetIsAutoStart(isEnabled)
 }
 
 func (s *FrontendQt) toggleAutoUpdate() {
@@ -595,14 +596,16 @@ func (s *FrontendQt) toggleEarlyAccess() {
 		channel = updater.EarlyChannel
 	}
 
-	err := s.bridge.SetUpdateChannel(channel)
+	needRestart, err := s.bridge.SetUpdateChannel(channel)
 	s.Qml.SetIsEarlyAccess(channel == updater.EarlyChannel)
 	if err != nil {
 		s.Qml.NotifyManualUpdateError()
 		return
 	}
-	s.restarter.SetToRestart()
-	s.App.Quit()
+	if needRestart {
+		s.restarter.SetToRestart()
+		s.App.Quit()
+	}
 }
 
 func (s *FrontendQt) toggleAllowProxy() {
@@ -733,4 +736,4 @@ func (s *FrontendQt) setKeychain(keychain string) {
 		s.restarter.SetToRestart()
 		s.App.Quit()
 	}
-}
+}

internal/frontend/qt/frontend_nogui.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build nogui
+// +build !build_qt
 
 package qt
 

internal/frontend/qt/helpers.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qt
 

internal/frontend/qt/notification.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qt
 

internal/frontend/qt/systray.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qt
 

internal/frontend/qt/ui.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qt
 
@@ -50,6 +50,7 @@ type GoQMLInterface struct {
 	_ string `property:"fullversion"`
 	_ string `property:"downloadLink"`
 
+	_ string `property:"updateState"`
 	_ string `property:"updateVersion"`
 	_ bool   `property:"updateCanInstall"`
 	_ string `property:"updateLandingPage"`
@@ -82,9 +83,8 @@ type GoQMLInterface struct {
 	_ float32 `property:"progress"`
 	_ string  `property:"progressDescription"`
 
-	_ func(isAvailable bool)   `signal:"setConnectionStatus"`
-	_ func(updateState string) `signal:"setUpdateState"`
-	_ func()                   `slot:"checkInternet"`
+	_ func(isAvailable bool) `signal:"setConnectionStatus"`
+	_ func()                 `slot:"checkInternet"`
 
 	_ func() `slot:"setToRestart"`
 

internal/frontend/share/icon.rc

@@ -1 +0,0 @@
-IDI_ICON1 ICON DISCARDABLE "logo.ico"

internal/frontend/share/info.rc

@@ -0,0 +1,45 @@
+#define STRINGIZE_(x) #x
+#define STRINGIZE(x) STRINGIZE_(x)
+
+IDI_ICON1 ICON DISCARDABLE STRINGIZE(ICO_FILE)
+
+#if defined BUILD_BRIDGE
+    #define FILE_COMMENTS "The Bridge is an application that runs on your computer in the background and seamlessly encrypts and decrypts your mail as it enters and leaves your computer."
+    #define FILE_DESCRIPTION "ProtonMail Bridge"
+    #define INTERNAL_NAME STRINGIZE(EXE_NAME)
+    #define PRODUCT_NAME "ProtonMail Bridge for Windows"
+#elif defined BUILD_IE
+    #define FILE_COMMENTS "The Import-Export app helps you to migrate your emails from local files or remote IMAP servers to ProtonMail or simply export emails to local folder."
+    #define FILE_DESCRIPTION "ProtonMail Import-Export app"
+    #define INTERNAL_NAME STRINGIZE(EXE_NAME)
+    #define PRODUCT_NAME "ProtonMail Import-Export app for Windows"
+#else
+    #error No target specified
+#endif
+
+#define LEGAL_COPYRIGHT "(C) " STRINGIZE(YEAR) " Proton Technologies AG"
+
+1 VERSIONINFO
+FILEVERSION     FILE_VERSION_COMMA,0
+PRODUCTVERSION  FILE_VERSION_COMMA,0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", FILE_COMMENTS
+            VALUE "CompanyName", "Proton Technologies AG"
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", STRINGIZE(FILE_VERSION)
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", STRINGIZE(ORIGINAL_FILE_NAME)
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", STRINGIZE(PRODUCT_VERSION)
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0409, 0x04B0
+    END
+END

internal/frontend/types/types.go

@@ -79,7 +79,7 @@ type Bridger interface {
 	AllowProxy()
 	DisallowProxy()
 	GetUpdateChannel() updater.UpdateChannel
-	SetUpdateChannel(updater.UpdateChannel) error
+	SetUpdateChannel(updater.UpdateChannel) (needRestart bool, err error)
 	GetKeychainApp() string
 	SetKeychainApp(keychain string)
 }
@@ -114,10 +114,10 @@ func (b *bridgeWrap) GetUser(query string) (User, error) {
 type ImportExporter interface {
 	UserManager
 
-	GetLocalImporter(string, string) (*transfer.Transfer, error)
-	GetRemoteImporter(string, string, string, string, string) (*transfer.Transfer, error)
-	GetEMLExporter(string, string) (*transfer.Transfer, error)
-	GetMBOXExporter(string, string) (*transfer.Transfer, error)
+	GetLocalImporter(string, string, string) (*transfer.Transfer, error)
+	GetRemoteImporter(string, string, string, string, string, string) (*transfer.Transfer, error)
+	GetEMLExporter(string, string, string) (*transfer.Transfer, error)
+	GetMBOXExporter(string, string, string) (*transfer.Transfer, error)
 	ReportBug(osType, osVersion, description, accountName, address, emailClient string) error
 	ReportFile(osType, osVersion, accountName, address string, logdata []byte) error
 }

internal/imap/backend.go

@@ -16,6 +16,19 @@
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
 // Package imap provides IMAP server of the Bridge.
+//
+// Methods are called by the go-imap library in parallel.
+// Additional parallelism is achieved while handling each IMAP request.
+//
+// For example, ListMessages internally uses `fetchWorkers` workers to resolve each requested item.
+// When IMAP clients request message literals (or parts thereof), we sometimes need to build RFC822 message literals.
+// To do this, we pass build jobs to the message builder, which internally manages its own parallelism.
+// Summary:
+//  - each IMAP fetch request is handled in parallel,
+//  - within each IMAP fetch request, individual items are handled by a pool of `fetchWorkers` workers,
+//  - within each worker, build jobs are posted to the message builder,
+//  - the message builder handles build jobs using its own, independent worker pool,
+// The builder will handle jobs in parallel up to its own internal limit. This prevents it from overwhelming API.
 package imap
 
 import (
@@ -26,10 +39,19 @@ import (
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/internal/events"
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/pkg/message"
 	"github.com/emersion/go-imap"
 	goIMAPBackend "github.com/emersion/go-imap/backend"
 )
 
+const (
+	// NOTE: Each fetch worker has its own set of attach workers so there can be up to 20*5=100 API requests at once.
+	// This is a reasonable limit to not overwhelm API while still maintaining as much parallelism as possible.
+	fetchWorkers  = 20 // In how many workers to fetch message (group list on IMAP).
+	attachWorkers = 5  // In how many workers to fetch attachments (for one message).
+	buildWorkers  = 20 // In how many workers to build messages.
+)
+
 type panicHandler interface {
 	HandlePanic()
 }
@@ -43,6 +65,8 @@ type imapBackend struct {
 	users       map[string]*imapUser
 	usersLocker sync.Locker
 
+	builder *message.Builder
+
 	imapCache     map[string]map[string]string
 	imapCachePath string
 	imapCacheLock *sync.RWMutex
@@ -78,6 +102,8 @@ func newIMAPBackend(
 		users:       map[string]*imapUser{},
 		usersLocker: &sync.Mutex{},
 
+		builder: message.NewBuilder(fetchWorkers, attachWorkers, buildWorkers),
+
 		imapCachePath: cache.GetIMAPCachePath(),
 		imapCacheLock: &sync.RWMutex{},
 	}

internal/imap/bridge.go

@@ -61,7 +61,7 @@ func (b *bridgeWrap) GetUser(query string) (bridgeUser, error) {
 	if err != nil {
 		return nil, err
 	}
-	return newBridgeUserWrap(user), nil
+	return newBridgeUserWrap(user), nil //nolint[typecheck] missing methods are inherited
 }
 
 type bridgeUserWrap struct {
@@ -77,5 +77,5 @@ func (u *bridgeUserWrap) GetStore() storeUserProvider {
 	if store == nil {
 		return nil
 	}
-	return newStoreUserWrap(store)
+	return newStoreUserWrap(store) //nolint[typecheck] missing methods are inherited
 }

internal/imap/id/extension.go

@@ -26,7 +26,7 @@ type currentClientSetter interface {
 	SetClient(name, version string)
 }
 
-// Extension for IMAP server
+// Extension for IMAP server.
 type extension struct {
 	extID        imapserver.ConnExtension
 	clientSetter currentClientSetter

internal/imap/imap.go

@@ -19,11 +19,4 @@ package imap
 
 import "github.com/sirupsen/logrus"
 
-const (
-	fetchMessagesWorkers    = 5 // In how many workers to fetch message (group list on IMAP).
-	fetchAttachmentsWorkers = 5 // In how many workers to fetch attachments (for one message).
-)
-
-var (
-	log = logrus.WithField("pkg", "imap") //nolint[gochecknoglobals]
-)
+var log = logrus.WithField("pkg", "imap") //nolint[gochecknoglobals]

internal/imap/mailbox.go

@@ -37,10 +37,12 @@ type imapMailbox struct {
 	storeUser    storeUserProvider
 	storeAddress storeAddressProvider
 	storeMailbox storeMailboxProvider
+
+	builder *message.Builder
 }
 
 // newIMAPMailbox returns struct implementing go-imap/mailbox interface.
-func newIMAPMailbox(panicHandler panicHandler, user *imapUser, storeMailbox storeMailboxProvider) *imapMailbox {
+func newIMAPMailbox(panicHandler panicHandler, user *imapUser, storeMailbox storeMailboxProvider, builder *message.Builder) *imapMailbox {
 	return &imapMailbox{
 		panicHandler: panicHandler,
 		user:         user,
@@ -54,6 +56,8 @@ func newIMAPMailbox(panicHandler panicHandler, user *imapUser, storeMailbox stor
 		storeUser:    user.storeUser,
 		storeAddress: user.storeAddress,
 		storeMailbox: storeMailbox,
+
+		builder: builder,
 	}
 }
 

internal/imap/mailbox_message.go

@@ -19,9 +19,9 @@ package imap
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
-	"mime/multipart"
 	"net/mail"
 	"net/textproto"
 	"sort"
@@ -32,12 +32,10 @@ import (
 	"github.com/ProtonMail/proton-bridge/internal/imap/cache"
 	"github.com/ProtonMail/proton-bridge/internal/imap/uidplus"
 	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/parallel"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/emersion/go-imap"
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
-	openpgperrors "golang.org/x/crypto/openpgp/errors"
 )
 
 var (
@@ -181,7 +179,7 @@ func (im *imapMailbox) createMessage(flags []string, date time.Time, body imap.L
 				return err
 			}
 
-			targetSeq := im.storeMailbox.GetUIDList([]string{m.ID})
+			targetSeq := im.storeMailbox.GetUIDList(IDs)
 			return uidplus.AppendResponse(im.storeMailbox.UIDValidity(), targetSeq)
 		}
 	}
@@ -226,8 +224,9 @@ func (im *imapMailbox) importMessage(m *pmapi.Message, readers []io.Reader, kr *
 	return im.storeMailbox.ImportMessage(m, body, labels)
 }
 
-func (im *imapMailbox) getMessage(storeMessage storeMessageProvider, items []imap.FetchItem) (msg *imap.Message, err error) {
-	im.log.WithField("msgID", storeMessage.ID()).Trace("Getting message")
+func (im *imapMailbox) getMessage(storeMessage storeMessageProvider, items []imap.FetchItem, msgBuildCountHistogram *msgBuildCountHistogram) (msg *imap.Message, err error) { //nolint[funlen]
+	msglog := im.log.WithField("msgID", storeMessage.ID())
+	msglog.Trace("Getting message")
 
 	seqNum, err := storeMessage.SequenceNumber()
 	if err != nil {
@@ -240,7 +239,9 @@ func (im *imapMailbox) getMessage(storeMessage storeMessageProvider, items []ima
 	for _, item := range items {
 		switch item {
 		case imap.FetchEnvelope:
-			msg.Envelope = message.GetEnvelope(m)
+			// No need to check IsFullHeaderCached here. API header
+			// contain enough information to build the envelope.
+			msg.Envelope = message.GetEnvelope(m, storeMessage.GetHeader())
 		case imap.FetchBody, imap.FetchBodyStructure:
 			var structure *message.BodyStructure
 			structure, err = im.getBodyStructure(storeMessage)
@@ -267,8 +268,13 @@ func (im *imapMailbox) getMessage(storeMessage storeMessageProvider, items []ima
 			// Size attribute on the server counts encrypted data. The value is cleared
 			// on our part and we need to compute "real" size of decrypted data.
 			if m.Size <= 0 {
-				im.log.WithField("msgID", storeMessage.ID()).Trace("Size unknown - downloading body")
-				if _, _, err = im.getBodyAndStructure(storeMessage); err != nil {
+				msglog.Debug("Size unknown - downloading body")
+				// We are sure the size is not a problem right now. Clients
+				// might not first check sizes of all messages so we couldn't
+				// be sure if seeing 1st or 2nd sync is all right or not.
+				// Therefore, it's better to exclude getting size from the
+				// counting and see build count as real message build.
+				if _, _, err = im.getBodyAndStructure(storeMessage, nil); err != nil {
 					return
 				}
 			}
@@ -278,8 +284,10 @@ func (im *imapMailbox) getMessage(storeMessage storeMessageProvider, items []ima
 			if err != nil {
 				return nil, err
 			}
+		case imap.FetchAll, imap.FetchFast, imap.FetchFull, imap.FetchRFC822, imap.FetchRFC822Header, imap.FetchRFC822Text:
+			fallthrough // this is list of defined items by go-imap, but items can be also sections generated from requests
 		default:
-			if err = im.getLiteralForSection(item, msg, storeMessage); err != nil {
+			if err = im.getLiteralForSection(item, msg, storeMessage, msgBuildCountHistogram); err != nil {
 				return
 			}
 		}
@@ -288,14 +296,15 @@ func (im *imapMailbox) getMessage(storeMessage storeMessageProvider, items []ima
 	return msg, err
 }
 
-func (im *imapMailbox) getLiteralForSection(itemSection imap.FetchItem, msg *imap.Message, storeMessage storeMessageProvider) error {
+func (im *imapMailbox) getLiteralForSection(itemSection imap.FetchItem, msg *imap.Message, storeMessage storeMessageProvider, msgBuildCountHistogram *msgBuildCountHistogram) error {
 	section, err := imap.ParseBodySectionName(itemSection)
-	if err != nil { // Ignore error
-		return nil
+	if err != nil {
+		log.WithError(err).Warn("Failed to parse body section name; part will be skipped")
+		return nil //nolint[nilerr] ignore error
 	}
 
 	var literal imap.Literal
-	if literal, err = im.getMessageBodySection(storeMessage, section); err != nil {
+	if literal, err = im.getMessageBodySection(storeMessage, section, msgBuildCountHistogram); err != nil {
 		return err
 	}
 
@@ -313,14 +322,20 @@ func (im *imapMailbox) getBodyStructure(storeMessage storeMessageProvider) (bs *
 		im.log.WithError(err).Debug("Fail to retrieve bodystructure from database")
 	}
 	if bs == nil {
-		if bs, _, err = im.getBodyAndStructure(storeMessage); err != nil {
+		// We are sure the body structure is not a problem right now.
+		// Clients might do first fetch body structure so we couldn't
+		// be sure if seeing 1st or 2nd sync is all right or not.
+		// Therefore, it's better to exclude first body structure fetch
+		// from the counting and see build count as real message build.
+		if bs, _, err = im.getBodyAndStructure(storeMessage, nil); err != nil {
 			return
 		}
 	}
 	return
 }
 
-func (im *imapMailbox) getBodyAndStructure(storeMessage storeMessageProvider) (
+//nolint[funlen] Jakub will fix in refactor
+func (im *imapMailbox) getBodyAndStructure(storeMessage storeMessageProvider, msgBuildCountHistogram *msgBuildCountHistogram) (
 	structure *message.BodyStructure,
 	bodyReader *bytes.Reader, err error,
 ) {
@@ -347,10 +362,26 @@ func (im *imapMailbox) getBodyAndStructure(storeMessage storeMessageProvider) (
 			}
 		}
 		if err == nil && structure != nil && len(body) > 0 {
-			if err := storeMessage.SetContentTypeAndHeader(m.MIMEType, m.Header); err != nil {
-				im.log.WithError(err).
+			header, errHead := structure.GetMailHeaderBytes(bytes.NewReader(body))
+			if errHead == nil {
+				if errHead := storeMessage.SetHeader(header); errHead != nil {
+					im.log.WithError(errHead).
+						WithField("msgID", m.ID).
+						Warn("Cannot update header after building")
+				}
+			} else {
+				im.log.WithError(errHead).
 					WithField("msgID", m.ID).
-					Warn("Cannot update header while building")
+					Warn("Cannot get header bytes after building")
+			}
+			if msgBuildCountHistogram != nil {
+				times, err := storeMessage.IncreaseBuildCount()
+				if err != nil {
+					im.log.WithError(err).
+						WithField("msgID", m.ID).
+						Warn("Cannot increase build count")
+				}
+				msgBuildCountHistogram.add(times)
 			}
 			// Drafts can change and we don't want to cache them.
 			if !isMessageInDraftFolder(m) {
@@ -379,40 +410,32 @@ func isMessageInDraftFolder(m *pmapi.Message) bool {
 
 // This will download message (or read from cache) and pick up the section,
 // extract data (header,body, both) and trim the output if needed.
-func (im *imapMailbox) getMessageBodySection(storeMessage storeMessageProvider, section *imap.BodySectionName) (literal imap.Literal, err error) { // nolint[funlen]
-	var (
-		structure  *message.BodyStructure
-		bodyReader *bytes.Reader
-		header     textproto.MIMEHeader
-		response   []byte
-	)
+func (im *imapMailbox) getMessageBodySection(
+	storeMessage storeMessageProvider,
+	section *imap.BodySectionName,
+	msgBuildCountHistogram *msgBuildCountHistogram,
+) (imap.Literal, error) {
+	var header textproto.MIMEHeader
+	var response []byte
 
 	im.log.WithField("msgID", storeMessage.ID()).Trace("Getting message body")
 
-	m := storeMessage.Message()
-
-	if len(section.Path) == 0 && section.Specifier == imap.HeaderSpecifier {
-		// We can extract message header without decrypting.
-		header = message.GetHeader(m)
-		// We need to ensure we use the correct content-type,
-		// otherwise AppleMail expects `text/plain` in HTML mails.
-		if header.Get("Content-Type") == "" {
-			if err = im.fetchMessage(m); err != nil {
-				return
-			}
-			if _, err = im.setMessageContentType(m); err != nil {
-				return
-			}
-			if err = storeMessage.SetContentTypeAndHeader(m.MIMEType, m.Header); err != nil {
-				return
-			}
-			header = message.GetHeader(m)
-		}
+	isMainHeaderRequested := len(section.Path) == 0 && section.Specifier == imap.HeaderSpecifier
+	if isMainHeaderRequested && storeMessage.IsFullHeaderCached() {
+		// In order to speed up (avoid download and decryptions) we
+		// cache the header. If a mail header was requested and DB
+		// contains full header (it means it was already built once)
+		// the DB header can be used without downloading and decrypting.
+		// Otherwise header is incomplete and clients would have issues
+		// e.g. AppleMail expects `text/plain` in HTML mails.
+		header = storeMessage.GetHeader()
 	} else {
-		// The rest of cases need download and decrypt.
-		structure, bodyReader, err = im.getBodyAndStructure(storeMessage)
+		// For all other cases it is necessary to download and decrypt the message
+		// and drop the header which was obtained from cache. The header will
+		// will be stored in DB once successfully built. Check `getBodyAndStructure`.
+		structure, bodyReader, err := im.getBodyAndStructure(storeMessage, msgBuildCountHistogram)
 		if err != nil {
-			return
+			return nil, err
 		}
 
 		switch {
@@ -423,368 +446,86 @@ func (im *imapMailbox) getMessageBodySection(storeMessage storeMessageProvider,
 			// The TEXT specifier refers to the content of the message (or section), omitting the [RFC-2822] header.
 			// Non-empty section with no specifier (imap.EntireSpecifier) refers to section content without header.
 			response, err = structure.GetSectionContent(bodyReader, section.Path)
-		case section.Specifier == imap.MIMESpecifier:
-			// The MIME part specifier refers to the [MIME-IMB] header for this part.
+		case section.Specifier == imap.MIMESpecifier: // The MIME part specifier refers to the [MIME-IMB] header for this part.
 			fallthrough
 		case section.Specifier == imap.HeaderSpecifier:
 			header, err = structure.GetSectionHeader(section.Path)
 		default:
 			err = errors.New("Unknown specifier " + string(section.Specifier))
 		}
+
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	if err != nil {
-		return
-	}
-
-	// Filter header. Options are: all fields, only selected fields, all fields except selected.
 	if header != nil {
-		// remove fields
-		if len(section.Fields) != 0 && section.NotFields {
-			for _, field := range section.Fields {
-				header.Del(field)
-			}
-		}
-
-		fields := make([]string, 0, len(header))
-		if len(section.Fields) == 0 || section.NotFields { // add all and sort
-			for f := range header {
-				fields = append(fields, f)
-			}
-			sort.Strings(fields)
-		} else { // add only requested (in requested order)
-			for _, f := range section.Fields {
-				fields = append(fields, textproto.CanonicalMIMEHeaderKey(f))
-			}
-		}
-
-		headerBuf := &bytes.Buffer{}
-		for _, canonical := range fields {
-			if values, ok := header[canonical]; !ok {
-				continue
-			} else {
-				for _, val := range values {
-					fmt.Fprintf(headerBuf, "%s: %s\r\n", canonical, val)
-				}
-			}
-		}
-		response = headerBuf.Bytes()
+		response = filteredHeaderAsBytes(header, section)
 	}
 
 	// Trim any output if requested.
-	literal = bytes.NewBuffer(section.ExtractPartial(response))
-	return literal, nil
+	return bytes.NewBuffer(section.ExtractPartial(response)), nil
 }
 
-func (im *imapMailbox) fetchMessage(m *pmapi.Message) (err error) {
-	im.log.Trace("Fetching message")
-
-	complete, err := im.storeMailbox.FetchMessage(m.ID)
-	if err != nil {
-		im.log.WithError(err).Error("Could not get message from store")
-		return
-	}
-
-	*m = *complete.Message()
-
-	return
-}
-
-func (im *imapMailbox) writeMessageBody(w io.Writer, m *pmapi.Message) (err error) {
-	im.log.Trace("Writing message body")
-
-	if m.Body == "" {
-		im.log.Trace("While writing message body, noticed message body is null, need to fetch")
-		if err = im.fetchMessage(m); err != nil {
-			return
+// filteredHeaderAsBytes filters the header fields by section fields and it
+// returns the filtered fields as bytes.
+// Options are: all fields, only selected fields, all fields except selected.
+func filteredHeaderAsBytes(header textproto.MIMEHeader, section *imap.BodySectionName) []byte {
+	// remove fields
+	if len(section.Fields) != 0 && section.NotFields {
+		for _, field := range section.Fields {
+			header.Del(field)
 		}
 	}
 
-	kr, err := im.user.client().KeyRingForAddressID(m.AddressID)
-	if err != nil {
-		return errors.Wrap(err, "failed to get keyring for address ID")
-	}
-
-	err = message.WriteBody(w, kr, m)
-	if err != nil {
-		if customMessageErr := message.CustomMessage(m, err, true); customMessageErr != nil {
-			im.log.WithError(customMessageErr).Warn("Failed to make custom message")
+	fields := make([]string, 0, len(header))
+	if len(section.Fields) == 0 || section.NotFields { // add all and sort
+		for f := range header {
+			fields = append(fields, f)
 		}
-		_, _ = io.WriteString(w, m.Body)
-		err = nil
-	}
-
-	return
-}
-
-func (im *imapMailbox) writeAttachmentBody(w io.Writer, m *pmapi.Message, att *pmapi.Attachment) (err error) {
-	// Retrieve encrypted attachment.
-	r, err := im.user.client().GetAttachment(att.ID)
-	if err != nil {
-		return
-	}
-	defer r.Close() //nolint[errcheck]
-
-	kr, err := im.user.client().KeyRingForAddressID(m.AddressID)
-	if err != nil {
-		return errors.Wrap(err, "failed to get keyring for address ID")
-	}
-
-	if err = message.WriteAttachmentBody(w, kr, m, att, r); err != nil {
-		// Returning an error here makes certain mail clients behave badly,
-		// trying to retrieve the message again and again.
-		im.log.Warn("Cannot write attachment body: ", err)
-		err = nil
-	}
-	return
-}
-
-func (im *imapMailbox) writeRelatedPart(p io.Writer, m *pmapi.Message, inlines []*pmapi.Attachment) (err error) {
-	related := multipart.NewWriter(p)
-
-	_ = related.SetBoundary(message.GetRelatedBoundary(m))
-
-	buf := &bytes.Buffer{}
-	if err = im.writeMessageBody(buf, m); err != nil {
-		return
-	}
-
-	// Write the body part.
-	h := message.GetBodyHeader(m)
-
-	if p, err = related.CreatePart(h); err != nil {
-		return
-	}
-
-	_, _ = buf.WriteTo(p)
-
-	for _, inline := range inlines {
-		buf = &bytes.Buffer{}
-		if err = im.writeAttachmentBody(buf, m, inline); err != nil {
-			return
+		sort.Strings(fields)
+	} else { // add only requested (in requested order)
+		for _, f := range section.Fields {
+			fields = append(fields, textproto.CanonicalMIMEHeaderKey(f))
 		}
+	}
 
-		h := message.GetAttachmentHeader(inline)
-		if p, err = related.CreatePart(h); err != nil {
-			return
+	headerBuf := &bytes.Buffer{}
+	for _, canonical := range fields {
+		if values, ok := header[canonical]; !ok {
+			continue
+		} else {
+			for _, val := range values {
+				fmt.Fprintf(headerBuf, "%s: %s\r\n", canonical, val)
+			}
 		}
-		_, _ = buf.WriteTo(p)
 	}
-
-	_ = related.Close()
-	return nil
-}
-
-const (
-	noMultipart      = iota // only body
-	simpleMultipart         // body + attachment or inline
-	complexMultipart        // mixed, rfc822, alternatives, ...
-)
-
-func (im *imapMailbox) setMessageContentType(m *pmapi.Message) (multipartType int, err error) {
-	if m.MIMEType == "" {
-		err = fmt.Errorf("trying to set Content-Type without MIME TYPE")
-		return
-	}
-	// message.MIMEType can have just three values from our server:
-	// * `text/html` (refers to body type, but might contain attachments and inlines)
-	// * `text/plain` (refers to body type, but might contain attachments and inlines)
-	// * `multipart/mixed` (refers to external message with multipart structure)
-	// The proper header content fields must be set and saved to DB based MIMEType and content.
-	multipartType = noMultipart
-	if m.MIMEType == pmapi.ContentTypeMultipartMixed {
-		multipartType = complexMultipart
-	} else if m.NumAttachments != 0 {
-		multipartType = simpleMultipart
-	}
-
-	h := textproto.MIMEHeader(m.Header)
-	if multipartType == noMultipart {
-		message.SetBodyContentFields(&h, m)
-	} else {
-		h.Set("Content-Type",
-			fmt.Sprintf("%s; boundary=%s", "multipart/mixed", message.GetBoundary(m)),
-		)
-	}
-	m.Header = mail.Header(h)
-
-	return
+	return headerBuf.Bytes()
 }
 
 // buildMessage from PM to IMAP.
-func (im *imapMailbox) buildMessage(m *pmapi.Message) (structure *message.BodyStructure, msgBody []byte, err error) {
-	im.log.Trace("Building message")
-
-	var errNoCache doNotCacheError
-
-	// If fetch or decryption fails we need to change the MIMEType (in customMessage).
-	err = im.fetchMessage(m)
+func (im *imapMailbox) buildMessage(m *pmapi.Message) (*message.BodyStructure, []byte, error) {
+	body, err := im.builder.NewJobWithOptions(
+		context.Background(),
+		im.user.client(),
+		m.ID,
+		message.JobOptions{
+			IgnoreDecryptionErrors: true, // Whether to ignore decryption errors and create a "custom message" instead.
+			SanitizeDate:           true, // Whether to replace all dates before 1970 with RFC822's birthdate.
+			AddInternalID:          true, // Whether to include MessageID as X-Pm-Internal-Id.
+			AddExternalID:          true, // Whether to include ExternalID as X-Pm-External-Id.
+			AddMessageDate:         true, // Whether to include message time as X-Pm-Date.
+			AddMessageIDReference:  true, // Whether to include the MessageID in References.
+		},
+	).GetResult()
 	if err != nil {
-		return
-	}
-
-	kr, err := im.user.client().KeyRingForAddressID(m.AddressID)
-	if err != nil {
-		err = errors.Wrap(err, "failed to get keyring for address ID")
-		return
-	}
-
-	errDecrypt := m.Decrypt(kr)
-
-	if errDecrypt != nil && errDecrypt != openpgperrors.ErrSignatureExpired {
-		errNoCache.add(errDecrypt)
-		if customMessageErr := message.CustomMessage(m, errDecrypt, true); customMessageErr != nil {
-			im.log.WithError(customMessageErr).Warn("Failed to make custom message")
-		}
-	}
-
-	// Inner function can fail even when message is decrypted.
-	// #1048 For example we have problem with double-encrypted messages
-	// which seems as still encrypted and we try them to decrypt again
-	// and that fails. For any building error is better to return custom
-	// message than error because it will not be fixed and users would
-	// get error message all the time and could not see some messages.
-	structure, msgBody, err = im.buildMessageInner(m, kr)
-	if err == pmapi.ErrAPINotReachable || err == pmapi.ErrInvalidToken || err == pmapi.ErrUpgradeApplication {
 		return nil, nil, err
-	} else if err != nil {
-		errNoCache.add(err)
-		if customMessageErr := message.CustomMessage(m, err, true); customMessageErr != nil {
-			im.log.WithError(customMessageErr).Warn("Failed to make custom message")
-		}
-		structure, msgBody, err = im.buildMessageInner(m, kr)
-		if err != nil {
-			return nil, nil, err
-		}
 	}
 
-	err = errNoCache.errorOrNil()
-
-	return structure, msgBody, err
-}
-
-func (im *imapMailbox) buildMessageInner(m *pmapi.Message, kr *crypto.KeyRing) (structure *message.BodyStructure, msgBody []byte, err error) { // nolint[funlen]
-	multipartType, err := im.setMessageContentType(m)
+	structure, err := message.NewBodyStructure(bytes.NewReader(body))
 	if err != nil {
-		return
+		return nil, nil, err
 	}
 
-	tmpBuf := &bytes.Buffer{}
-	mainHeader := buildHeader(m)
-	if err = writeHeader(tmpBuf, mainHeader); err != nil {
-		return
-	}
-	_, _ = io.WriteString(tmpBuf, "\r\n")
-
-	switch multipartType {
-	case noMultipart:
-		err = message.WriteBody(tmpBuf, kr, m)
-		if err != nil {
-			return
-		}
-	case complexMultipart:
-		_, _ = io.WriteString(tmpBuf, "\r\n--"+message.GetBoundary(m)+"\r\n")
-		err = message.WriteBody(tmpBuf, kr, m)
-		if err != nil {
-			return
-		}
-		_, _ = io.WriteString(tmpBuf, "\r\n--"+message.GetBoundary(m)+"--\r\n")
-	case simpleMultipart:
-		atts, inlines := message.SeparateInlineAttachments(m)
-		mw := multipart.NewWriter(tmpBuf)
-		_ = mw.SetBoundary(message.GetBoundary(m))
-
-		var partWriter io.Writer
-
-		if len(inlines) > 0 {
-			relatedHeader := message.GetRelatedHeader(m)
-			if partWriter, err = mw.CreatePart(relatedHeader); err != nil {
-				return
-			}
-			_ = im.writeRelatedPart(partWriter, m, inlines)
-		} else {
-			buf := &bytes.Buffer{}
-			if err = im.writeMessageBody(buf, m); err != nil {
-				return
-			}
-
-			// Write the body part.
-			bodyHeader := message.GetBodyHeader(m)
-			if partWriter, err = mw.CreatePart(bodyHeader); err != nil {
-				return
-			}
-
-			_, _ = buf.WriteTo(partWriter)
-		}
-
-		// Write the attachments parts.
-		input := make([]interface{}, len(atts))
-		for i, att := range atts {
-			input[i] = att
-		}
-
-		processCallback := func(value interface{}) (interface{}, error) {
-			att := value.(*pmapi.Attachment)
-
-			buf := &bytes.Buffer{}
-			if err = im.writeAttachmentBody(buf, m, att); err != nil {
-				return nil, err
-			}
-			return buf, nil
-		}
-
-		collectCallback := func(idx int, value interface{}) error {
-			buf := value.(*bytes.Buffer)
-			defer buf.Reset()
-			att := atts[idx]
-
-			attachmentHeader := message.GetAttachmentHeader(att)
-			if partWriter, err = mw.CreatePart(attachmentHeader); err != nil {
-				return err
-			}
-
-			_, _ = buf.WriteTo(partWriter)
-			return nil
-		}
-
-		err = parallel.RunParallel(fetchAttachmentsWorkers, input, processCallback, collectCallback)
-		if err != nil {
-			return
-		}
-
-		_ = mw.Close()
-	default:
-		fmt.Fprintf(tmpBuf, "\r\n\r\nUknown multipart type: %d\r\n\r\n", multipartType)
-	}
-
-	// We need to copy buffer before building body structure.
-	msgBody = tmpBuf.Bytes()
-	structure, err = message.NewBodyStructure(tmpBuf)
-	if err != nil {
-		// NOTE: We need to set structure if it fails and is empty.
-		if structure == nil {
-			structure = &message.BodyStructure{}
-		}
-	}
-	return structure, msgBody, err
-}
-
-func buildHeader(msg *pmapi.Message) textproto.MIMEHeader {
-	header := message.GetHeader(msg)
-
-	msgTime := time.Unix(msg.Time, 0)
-
-	// Apple Mail crashes fetching messages with date older than 1970.
-	// There is no point having message older than RFC itself, it's not possible.
-	d, err := msg.Header.Date()
-	if err != nil || d.Before(rfc822Birthday) || msgTime.Before(rfc822Birthday) {
-		if err != nil || d.IsZero() {
-			header.Set("X-Original-Date", msgTime.Format(time.RFC1123Z))
-		} else {
-			header.Set("X-Original-Date", d.Format(time.RFC1123Z))
-		}
-		header.Set("Date", rfc822Birthday.Format(time.RFC1123Z))
-	}
-
-	return header
+	return structure, body, nil
 }

internal/imap/mailbox_messages.go

@@ -141,7 +141,7 @@ func (im *imapMailbox) addOrRemoveFlags(operation imap.FlagsOp, messageIDs, flag
 	for _, f := range flags {
 		switch f {
 		case imap.SeenFlag:
-			switch operation {
+			switch operation { //nolint[exhaustive] imap.SetFlags is processed by im.setFlags
 			case imap.AddFlags:
 				if err := im.storeMailbox.MarkMessagesRead(messageIDs); err != nil {
 					return err
@@ -152,7 +152,7 @@ func (im *imapMailbox) addOrRemoveFlags(operation imap.FlagsOp, messageIDs, flag
 				}
 			}
 		case imap.FlaggedFlag:
-			switch operation {
+			switch operation { //nolint[exhaustive] imap.SetFlag is processed by im.setFlags
 			case imap.AddFlags:
 				if err := im.storeMailbox.MarkMessagesStarred(messageIDs); err != nil {
 					return err
@@ -163,7 +163,7 @@ func (im *imapMailbox) addOrRemoveFlags(operation imap.FlagsOp, messageIDs, flag
 				}
 			}
 		case imap.DeletedFlag:
-			switch operation {
+			switch operation { //nolint[exhaustive] imap.SetFlag is processed by im.setFlags
 			case imap.AddFlags:
 				if err := im.storeMailbox.MarkMessagesDeleted(messageIDs); err != nil {
 					return err
@@ -182,7 +182,7 @@ func (im *imapMailbox) addOrRemoveFlags(operation imap.FlagsOp, messageIDs, flag
 			}
 
 			// Handle custom junk flags for Apple Mail and Thunderbird.
-			switch operation {
+			switch operation { //nolint[exhaustive] imap.SetFlag is processed by im.setFlags
 			// No label removal is necessary because Spam and Inbox are both exclusive labels so the backend
 			// will automatically take care of label removal.
 			case imap.AddFlags:
@@ -358,23 +358,29 @@ func (im *imapMailbox) SearchMessages(isUID bool, criteria *imap.SearchCriteria)
 				continue
 			}
 		}
+
+		// In order to speed up search it is not needed to check
+		// if IsFullHeaderCached.
+		header := storeMessage.GetHeader()
+
 		if !criteria.SentBefore.IsZero() || !criteria.SentSince.IsZero() {
-			if t, err := m.Header.Date(); err == nil && !t.IsZero() {
-				if !criteria.SentBefore.IsZero() {
-					if truncated := criteria.SentBefore.Truncate(24 * time.Hour); t.Unix() > truncated.Unix() {
-						continue
-					}
+			t, err := mail.Header(header).Date()
+			if err != nil || t.IsZero() {
+				t = time.Unix(m.Time, 0)
+			}
+			if !criteria.SentBefore.IsZero() {
+				if truncated := criteria.SentBefore.Truncate(24 * time.Hour); t.Unix() > truncated.Unix() {
+					continue
 				}
-				if !criteria.SentSince.IsZero() {
-					if truncated := criteria.SentSince.Truncate(24 * time.Hour); t.Unix() < truncated.Unix() {
-						continue
-					}
+			}
+			if !criteria.SentSince.IsZero() {
+				if truncated := criteria.SentSince.Truncate(24 * time.Hour); t.Unix() < truncated.Unix() {
+					continue
 				}
 			}
 		}
 
 		// Filter by headers.
-		header := message.GetHeader(m)
 		headerMatch := true
 		for criteriaKey, criteriaValues := range criteria.Header {
 			for _, criteriaValue := range criteriaValues {
@@ -382,6 +388,8 @@ func (im *imapMailbox) SearchMessages(isUID bool, criteria *imap.SearchCriteria)
 					continue
 				}
 				switch criteriaKey {
+				case "Subject":
+					headerMatch = strings.Contains(strings.ToLower(m.Subject), strings.ToLower(criteriaValue))
 				case "From":
 					headerMatch = addressMatch([]*mail.Address{m.Sender}, criteriaValue)
 				case "To":
@@ -482,12 +490,13 @@ func (im *imapMailbox) SearchMessages(isUID bool, criteria *imap.SearchCriteria)
 //
 // Messages must be sent to msgResponse. When the function returns, msgResponse must be closed.
 func (im *imapMailbox) ListMessages(isUID bool, seqSet *imap.SeqSet, items []imap.FetchItem, msgResponse chan<- *imap.Message) error {
+	msgBuildCountHistogram := newMsgBuildCountHistogram()
 	return im.logCommand(func() error {
-		return im.listMessages(isUID, seqSet, items, msgResponse)
-	}, "FETCH", isUID, seqSet, items)
+		return im.listMessages(isUID, seqSet, items, msgResponse, msgBuildCountHistogram)
+	}, "FETCH", isUID, seqSet, items, msgBuildCountHistogram)
 }
 
-func (im *imapMailbox) listMessages(isUID bool, seqSet *imap.SeqSet, items []imap.FetchItem, msgResponse chan<- *imap.Message) (err error) { //nolint[funlen]
+func (im *imapMailbox) listMessages(isUID bool, seqSet *imap.SeqSet, items []imap.FetchItem, msgResponse chan<- *imap.Message, msgBuildCountHistogram *msgBuildCountHistogram) (err error) { //nolint[funlen]
 	defer func() {
 		close(msgResponse)
 		if err != nil {
@@ -535,7 +544,7 @@ func (im *imapMailbox) listMessages(isUID bool, seqSet *imap.SeqSet, items []ima
 	}
 
 	processCallback := func(value interface{}) (interface{}, error) {
-		apiID := value.(string)
+		apiID := value.(string) //nolint[forcetypeassert] we want to panic here
 
 		storeMessage, err := im.storeMailbox.GetMessage(apiID)
 		if err != nil {
@@ -544,7 +553,7 @@ func (im *imapMailbox) listMessages(isUID bool, seqSet *imap.SeqSet, items []ima
 			return nil, err
 		}
 
-		msg, err := im.getMessage(storeMessage, items)
+		msg, err := im.getMessage(storeMessage, items, msgBuildCountHistogram)
 		if err != nil {
 			err = fmt.Errorf("list message build: %v", err)
 			l.WithField("metaID", storeMessage.ID()).Error(err)
@@ -569,12 +578,12 @@ func (im *imapMailbox) listMessages(isUID bool, seqSet *imap.SeqSet, items []ima
 	}
 
 	collectCallback := func(idx int, value interface{}) error {
-		msg := value.(*imap.Message)
+		msg := value.(*imap.Message) //nolint[forcetypeassert] we want to panic here
 		msgResponse <- msg
 		return nil
 	}
 
-	err = parallel.RunParallel(fetchMessagesWorkers, input, processCallback, collectCallback)
+	err = parallel.RunParallel(fetchWorkers, input, processCallback, collectCallback)
 	if err != nil {
 		return err
 	}

internal/imap/msg_build_counts.go

@@ -0,0 +1,65 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package imap
+
+import (
+	"fmt"
+	"sync"
+)
+
+// msgBuildCountHistogram is used to analyse and log the number of repetitive
+// downloads of requested messages per one fetch. The number of builds per each
+// messageID is stored in persistent database. The msgBuildCountHistogram will
+// take this number for each message in ongoing fetch and create histogram of
+// repeats.
+//
+// Example: During `fetch 1:300` there were
+// - 100 messages were downloaded first time
+// - 100 messages were downloaded second time
+// - 99 messages were downloaded 10th times
+// - 1 messages were downloaded 100th times.
+type msgBuildCountHistogram struct {
+	// Key represents how many times message was build.
+	// Value stores how many messages are build X times based on the key.
+	counts map[uint32]uint32
+	lock   sync.Locker
+}
+
+func newMsgBuildCountHistogram() *msgBuildCountHistogram {
+	return &msgBuildCountHistogram{
+		counts: map[uint32]uint32{},
+		lock:   &sync.Mutex{},
+	}
+}
+
+func (c *msgBuildCountHistogram) String() string {
+	res := ""
+	for nRebuild, counts := range c.counts {
+		if res != "" {
+			res += ", "
+		}
+		res += fmt.Sprintf("[%d]:%d", nRebuild, counts)
+	}
+	return res
+}
+
+func (c *msgBuildCountHistogram) add(nRebuild uint32) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	c.counts[nRebuild]++
+}

internal/imap/store.go

@@ -20,6 +20,7 @@ package imap
 import (
 	"io"
 	"net/mail"
+	"net/textproto"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/ProtonMail/proton-bridge/internal/imap/uidplus"
@@ -100,9 +101,12 @@ type storeMessageProvider interface {
 	IsMarkedDeleted() bool
 
 	SetSize(int64) error
-	SetContentTypeAndHeader(string, mail.Header) error
+	SetHeader([]byte) error
+	GetHeader() textproto.MIMEHeader
+	IsFullHeaderCached() bool
 	SetBodyStructure(*pkgMsg.BodyStructure) error
 	GetBodyStructure() (*pkgMsg.BodyStructure, error)
+	IncreaseBuildCount() (uint32, error)
 }
 
 type storeUserWrap struct {
@@ -122,7 +126,7 @@ func (s *storeUserWrap) GetAddress(addressID string) (storeAddressProvider, erro
 	if err != nil {
 		return nil, err
 	}
-	return newStoreAddressWrap(address), nil
+	return newStoreAddressWrap(address), nil //nolint[typecheck] missing methods are inherited
 }
 
 type storeAddressWrap struct {
@@ -136,7 +140,7 @@ func newStoreAddressWrap(address *store.Address) *storeAddressWrap {
 func (s *storeAddressWrap) ListMailboxes() []storeMailboxProvider {
 	mailboxes := []storeMailboxProvider{}
 	for _, mailbox := range s.Address.ListMailboxes() {
-		mailboxes = append(mailboxes, newStoreMailboxWrap(mailbox))
+		mailboxes = append(mailboxes, newStoreMailboxWrap(mailbox)) //nolint[typecheck] missing methods are inherited
 	}
 	return mailboxes
 }
@@ -146,7 +150,7 @@ func (s *storeAddressWrap) GetMailbox(name string) (storeMailboxProvider, error)
 	if err != nil {
 		return nil, err
 	}
-	return newStoreMailboxWrap(mailbox), nil
+	return newStoreMailboxWrap(mailbox), nil //nolint[typecheck] missing methods are inherited
 }
 
 type storeMailboxWrap struct {

internal/imap/uidplus/extension.go

@@ -33,7 +33,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// Capability extension identifier
+// Capability extension identifier.
 const Capability = "UIDPLUS"
 
 const (
@@ -228,7 +228,9 @@ func getStatusResponseCopy(uidValidity uint32, sourceSeq, targetSeq *OrderedSeq)
 
 // CopyResponse prepares OK response with extended UID information about copied message.
 func CopyResponse(uidValidity uint32, sourceSeq, targetSeq *OrderedSeq) error {
-	return server.ErrStatusResp(getStatusResponseCopy(uidValidity, sourceSeq, targetSeq))
+	return &imap.ErrStatusResp{
+		Resp: getStatusResponseCopy(uidValidity, sourceSeq, targetSeq),
+	}
 }
 
 func getStatusResponseAppend(uidValidity uint32, targetSeq *OrderedSeq) *imap.StatusResp {
@@ -250,5 +252,7 @@ func getStatusResponseAppend(uidValidity uint32, targetSeq *OrderedSeq) *imap.St
 
 // AppendResponse prepares OK response with extended UID information about appended message.
 func AppendResponse(uidValidity uint32, targetSeq *OrderedSeq) error {
-	return server.ErrStatusResp(getStatusResponseAppend(uidValidity, targetSeq))
+	return &imap.ErrStatusResp{
+		Resp: getStatusResponseAppend(uidValidity, targetSeq),
+	}
 }

internal/imap/user.go

@@ -135,7 +135,7 @@ func (iu *imapUser) ListMailboxes(showOnlySubcribed bool) ([]goIMAPBackend.Mailb
 		if showOnlySubcribed && !iu.isSubscribed(storeMailbox.LabelID()) {
 			continue
 		}
-		mailbox := newIMAPMailbox(iu.panicHandler, iu, storeMailbox)
+		mailbox := newIMAPMailbox(iu.panicHandler, iu, storeMailbox, iu.backend.builder)
 		mailboxes = append(mailboxes, mailbox)
 	}
 
@@ -167,7 +167,7 @@ func (iu *imapUser) GetMailbox(name string) (mb goIMAPBackend.Mailbox, err error
 		return
 	}
 
-	return newIMAPMailbox(iu.panicHandler, iu, storeMailbox), nil
+	return newIMAPMailbox(iu.panicHandler, iu, storeMailbox, iu.backend.builder), nil
 }
 
 // CreateMailbox creates a new mailbox.

internal/importexport/importexport.go

@@ -88,7 +88,7 @@ func (ie *ImportExport) ReportBug(osType, osVersion, description, accountName, a
 	return nil
 }
 
-// ReportFile submits import report file
+// ReportFile submits import report file.
 func (ie *ImportExport) ReportFile(osType, osVersion, accountName, address string, logdata []byte) error {
 	c := ie.clientManager.GetAnonymousClient()
 	defer c.Logout()
@@ -118,9 +118,9 @@ func (ie *ImportExport) ReportFile(osType, osVersion, accountName, address strin
 }
 
 // GetLocalImporter returns transferrer from local EML or MBOX structure to ProtonMail account.
-func (ie *ImportExport) GetLocalImporter(address, path string) (*transfer.Transfer, error) {
+func (ie *ImportExport) GetLocalImporter(username, address, path string) (*transfer.Transfer, error) {
 	source := transfer.NewLocalProvider(path)
-	target, err := ie.getPMAPIProvider(address)
+	target, err := ie.getPMAPIProvider(username, address)
 	if err != nil {
 		return nil, err
 	}
@@ -132,12 +132,12 @@ func (ie *ImportExport) GetLocalImporter(address, path string) (*transfer.Transf
 }
 
 // GetRemoteImporter returns transferrer from remote IMAP to ProtonMail account.
-func (ie *ImportExport) GetRemoteImporter(address, username, password, host, port string) (*transfer.Transfer, error) {
-	source, err := transfer.NewIMAPProvider(username, password, host, port)
+func (ie *ImportExport) GetRemoteImporter(username, address, remoteUsername, remotePassword, host, port string) (*transfer.Transfer, error) {
+	source, err := transfer.NewIMAPProvider(remoteUsername, remotePassword, host, port)
 	if err != nil {
 		return nil, err
 	}
-	target, err := ie.getPMAPIProvider(address)
+	target, err := ie.getPMAPIProvider(username, address)
 	if err != nil {
 		return nil, err
 	}
@@ -149,8 +149,8 @@ func (ie *ImportExport) GetRemoteImporter(address, username, password, host, por
 }
 
 // GetEMLExporter returns transferrer from ProtonMail account to local EML structure.
-func (ie *ImportExport) GetEMLExporter(address, path string) (*transfer.Transfer, error) {
-	source, err := ie.getPMAPIProvider(address)
+func (ie *ImportExport) GetEMLExporter(username, address, path string) (*transfer.Transfer, error) {
+	source, err := ie.getPMAPIProvider(username, address)
 	if err != nil {
 		return nil, err
 	}
@@ -163,8 +163,8 @@ func (ie *ImportExport) GetEMLExporter(address, path string) (*transfer.Transfer
 }
 
 // GetMBOXExporter returns transferrer from ProtonMail account to local MBOX structure.
-func (ie *ImportExport) GetMBOXExporter(address, path string) (*transfer.Transfer, error) {
-	source, err := ie.getPMAPIProvider(address)
+func (ie *ImportExport) GetMBOXExporter(username, address, path string) (*transfer.Transfer, error) {
+	source, err := ie.getPMAPIProvider(username, address)
 	if err != nil {
 		return nil, err
 	}
@@ -176,8 +176,8 @@ func (ie *ImportExport) GetMBOXExporter(address, path string) (*transfer.Transfe
 	return transfer.New(ie.panicHandler, newExportMetricsManager(ie), logsPath, ie.cache.GetTransferDir(), source, target)
 }
 
-func (ie *ImportExport) getPMAPIProvider(address string) (*transfer.PMAPIProvider, error) {
-	user, err := ie.Users.GetUser(address)
+func (ie *ImportExport) getPMAPIProvider(username, address string) (*transfer.PMAPIProvider, error) {
+	user, err := ie.Users.GetUser(username)
 	if err != nil {
 		return nil, err
 	}

internal/locations/locations.go

@@ -32,9 +32,9 @@ import (
 // On linux:
 // - settings: ~/.config/protonmail/<app>
 // - logs: ~/.cache/protonmail/<app>/logs
-// - cache: ~/.cache/protonmail/<app>/cache
-// - updates: ~/.cache/protonmail/<app>/updates
-// - lockfile: ~/.cache/protonmail/<app>/<app>.lock
+// - cache: ~/.config/protonmail/<app>/cache
+// - updates: ~/.config/protonmail/<app>/updates
+// - lockfile: ~/.cache/protonmail/<app>/<app>.lock .
 type Locations struct {
 	userConfig, userCache string
 	configName            string
@@ -129,7 +129,7 @@ func (l *Locations) ProvideLogsPath() (string, error) {
 	return l.getLogsPath(), nil
 }
 
-// ProvideCachePath returns a location for user cache dirs (e.g. ~/.cache/<company>/<app>/cache).
+// ProvideCachePath returns a location for user cache dirs (e.g. ~/.config/<company>/<app>/cache).
 // It creates it if it doesn't already exist.
 func (l *Locations) ProvideCachePath() (string, error) {
 	if err := os.MkdirAll(l.getCachePath(), 0700); err != nil {
@@ -139,6 +139,11 @@ func (l *Locations) ProvideCachePath() (string, error) {
 	return l.getCachePath(), nil
 }
 
+// GetOldCachePath returns a former location for user cache dirs used for migration scripts only.
+func (l *Locations) GetOldCachePath() string {
+	return filepath.Join(l.userCache, "cache")
+}
+
 // ProvideUpdatesPath returns a location for update files (e.g. ~/.cache/<company>/<app>/updates).
 // It creates it if it doesn't already exist.
 func (l *Locations) ProvideUpdatesPath() (string, error) {
@@ -149,6 +154,16 @@ func (l *Locations) ProvideUpdatesPath() (string, error) {
 	return l.getUpdatesPath(), nil
 }
 
+// GetUpdatesPath returns a new location for update files used for migration scripts only.
+func (l *Locations) GetUpdatesPath() string {
+	return l.getUpdatesPath()
+}
+
+// GetOldUpdatesPath returns a former location for update files used for migration scripts only.
+func (l *Locations) GetOldUpdatesPath() string {
+	return filepath.Join(l.userCache, "updates")
+}
+
 func (l *Locations) getSettingsPath() string {
 	return l.userConfig
 }
@@ -158,11 +173,33 @@ func (l *Locations) getLogsPath() string {
 }
 
 func (l *Locations) getCachePath() string {
-	return filepath.Join(l.userCache, "cache")
+	// Bridge cache is not a typical cache which can be deleted with only
+	// downside that the app has to download everything again.
+	// Cache for bridge is database with IMAP UIDs and UIDVALIDITY, and also
+	// other IMAP setup. Deleting such data leads to either re-sync of client,
+	// or mix of headers and bodies. Both is caused because of need of re-sync
+	// between Bridge and API which will happen in different order than before.
+	// In the first case, UIDVALIDITY is also changed and causes the better
+	// outcome to "just" re-sync everything; in the later, UIDVALIDITY stays
+	// the same, causing the client to not re-sync but UIDs in the client does
+	// not match UIDs in Bridge.
+	// Because users might use tools to regularly clear caches, Bridge cache
+	// cannot be located in a standard cache folder.
+	return filepath.Join(l.userConfig, "cache")
 }
 
 func (l *Locations) getUpdatesPath() string {
-	return filepath.Join(l.userCache, "updates")
+	// In order to properly update Bridge 1.6.X and higher we need to
+	// change the launcher first. Since this is not part of automatic
+	// updates the migration must wait until manual update. Until that
+	// we need to keep old path.
+	if l.configName == "bridge" {
+		return l.GetOldUpdatesPath()
+	}
+
+	// Users might use tools to regularly clear caches, which would mean always
+	// removing updates, therefore Bridge updates have to be somewhere else.
+	return filepath.Join(l.userConfig, "updates")
 }
 
 // Clear removes everything except the lock and update files.

internal/locations/locations_test.go

@@ -45,7 +45,8 @@ func TestClearRemovesEverythingExceptLockAndUpdateFiles(t *testing.T) {
 	assert.NoError(t, l.Clear())
 
 	assert.FileExists(t, l.GetLockFile())
-	assert.NoDirExists(t, l.getSettingsPath())
+	assert.DirExists(t, l.getSettingsPath())
+	assert.NoFileExists(t, filepath.Join(l.getSettingsPath(), "prefs.json"))
 	assert.NoDirExists(t, l.getLogsPath())
 	assert.NoDirExists(t, l.getCachePath())
 	assert.DirExists(t, l.getUpdatesPath())
@@ -58,6 +59,7 @@ func TestClearUpdateFiles(t *testing.T) {
 
 	assert.FileExists(t, l.GetLockFile())
 	assert.DirExists(t, l.getSettingsPath())
+	assert.FileExists(t, filepath.Join(l.getSettingsPath(), "prefs.json"))
 	assert.DirExists(t, l.getLogsPath())
 	assert.DirExists(t, l.getCachePath())
 	assert.NoDirExists(t, l.getUpdatesPath())
@@ -75,6 +77,7 @@ func TestCleanLeavesStandardLocationsUntouched(t *testing.T) {
 
 	assert.FileExists(t, l.GetLockFile())
 	assert.DirExists(t, l.getSettingsPath())
+	assert.FileExists(t, filepath.Join(l.getSettingsPath(), "prefs.json"))
 	assert.DirExists(t, l.getLogsPath())
 	assert.FileExists(t, filepath.Join(l.getLogsPath(), "log1.txt"))
 	assert.FileExists(t, filepath.Join(l.getLogsPath(), "log2.txt"))
@@ -138,6 +141,9 @@ func newTestLocations(t *testing.T) *Locations {
 	require.NoError(t, err)
 	require.DirExists(t, settings)
 
+	createFilesInDir(t, settings, "prefs.json")
+	require.FileExists(t, filepath.Join(settings, "prefs.json"))
+
 	logs, err := l.ProvideLogsPath()
 	require.NoError(t, err)
 	require.DirExists(t, logs)

internal/logging/crash.go

@@ -34,7 +34,7 @@ func DumpStackTrace(logsPath string) crash.RecoveryAction {
 	return func(r interface{}) error {
 		file := filepath.Join(logsPath, getStackTraceName(constants.Version, constants.Revision))
 
-		f, err := os.OpenFile(file, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600)
+		f, err := os.OpenFile(filepath.Clean(file), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600)
 		if err != nil {
 			return err
 		}

internal/logging/logging.go

@@ -42,6 +42,7 @@ const (
 
 func Init(logsPath string) error {
 	logrus.SetFormatter(&logrus.TextFormatter{
+		ForceColors:     true,
 		FullTimestamp:   true,
 		TimestampFormat: time.StampMilli,
 	})
@@ -69,6 +70,10 @@ func Init(logsPath string) error {
 	return nil
 }
 
+// SetLevel will change the level of logging and in case of Debug or Trace
+// level it will also prevent from writing to file. Setting level to Info or
+// higher will not set writing to file again if it was previously cancelled by
+// Debug or Trace.
 func SetLevel(level string) {
 	if lvl, err := logrus.ParseLevel(level); err == nil {
 		logrus.SetLevel(lvl)

internal/smtp/bridge.go

@@ -51,7 +51,7 @@ func (b *bridgeWrap) GetUser(query string) (bridgeUser, error) {
 	if err != nil {
 		return nil, err
 	}
-	return newBridgeUserWrap(user), nil
+	return newBridgeUserWrap(user), nil //nolint[typecheck] missing methods are inherited
 }
 
 type bridgeUserWrap struct {

internal/smtp/dump_default.go

@@ -0,0 +1,22 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// +build !build_qa
+
+package smtp
+
+func dumpMessageData([]byte, string) {}

internal/smtp/dump_qa.go

@@ -0,0 +1,60 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// +build build_qa
+
+package smtp
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/sirupsen/logrus"
+)
+
+func dumpMessageData(b []byte, subject string) {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		logrus.WithError(err).Error("Failed to dump raw message data")
+		return
+	}
+
+	path := filepath.Join(home, "bridge-qa")
+
+	if err := os.MkdirAll(path, 0700); err != nil {
+		logrus.WithError(err).Error("Failed to dump raw message data")
+		return
+	}
+
+	if len(subject) > 16 {
+		subject = subject[:16]
+	}
+
+	if err := ioutil.WriteFile(
+		filepath.Join(path, fmt.Sprintf("%v-%v.eml", subject, time.Now().Format(time.RFC3339Nano))),
+		b,
+		0600,
+	); err != nil {
+		logrus.WithError(err).Error("Failed to dump raw message data")
+		return
+	}
+
+	logrus.WithField("path", path).Info("Dumped raw message data")
+}

internal/smtp/preferences.go

@@ -173,7 +173,7 @@ func (b *sendPreferencesBuilder) withPublicKey(v *crypto.KeyRing) {
 //								| 16 (PGP/MIME),
 //     mimeType: 'text/html' | 'text/plain' | 'multipart/mixed',
 //     publicKey: OpenPGPKey | undefined/null
-// }
+// }.
 func (b *sendPreferencesBuilder) build() (p SendPreferences) {
 	p.Encrypt = b.shouldEncrypt()
 	p.Sign = b.shouldSign()
@@ -492,6 +492,8 @@ func (b *sendPreferencesBuilder) setEncryptionPreferences(mailSettings pmapi.Mai
 		b.withSchemeDefault(pgpInline)
 	case pmapi.PGPMIMEPackage:
 		b.withSchemeDefault(pgpMIME)
+	case pmapi.ClearMIMEPackage, pmapi.ClearPackage, pmapi.EncryptedOutsidePackage, pmapi.InternalPackage:
+		// nothing to set
 	}
 
 	// Its value is constrained by the sign flag and the PGP scheme:

internal/smtp/server.go

@@ -42,6 +42,7 @@ func NewSMTPServer(debug bool, port int, useSSL bool, tls *tls.Config, smtpBacke
 	s.TLSConfig = tls
 	s.Domain = bridge.Host
 	s.AllowInsecureAuth = true
+	s.MaxLineLength = 2 << 16
 
 	if debug {
 		fmt.Println("THE LOG WILL CONTAIN **DECRYPTED** MESSAGE DATA")

internal/smtp/user.go

@@ -215,6 +215,10 @@ func (su *smtpUser) Send(returnPath string, to []string, messageReader io.Reader
 	// Called from go-smtp in goroutines - we need to handle panics for each function.
 	defer su.panicHandler.HandlePanic()
 
+	b := new(bytes.Buffer)
+
+	messageReader = io.TeeReader(messageReader, b)
+
 	mailSettings, err := su.client().GetMailSettings()
 	if err != nil {
 		return err
@@ -405,6 +409,8 @@ func (su *smtpUser) Send(returnPath string, to []string, messageReader io.Reader
 
 	req.PreparePackages()
 
+	dumpMessageData(b.Bytes(), message.Subject)
+
 	return su.storeUser.SendMessage(message.ID, req)
 }
 

internal/store/event_loop.go

@@ -156,6 +156,7 @@ func (loop *eventLoop) loop() {
 			return
 		case <-t.C:
 			// Randomise periodic calls within range pollInterval ± pollSpread to reduces potential load spikes on API.
+			//nolint[gosec] It is OK to use weaker random number generator here
 			time.Sleep(time.Duration(rand.Intn(2*int(pollIntervalSpread.Milliseconds()))) * time.Millisecond)
 		case eventProcessedCh = <-loop.pollCh:
 			// We don't want to wait here. Polling should happen instantly.
@@ -268,8 +269,6 @@ func (loop *eventLoop) processNextEvent() (more bool, err error) { // nolint[fun
 		return false, errors.New("received empty event")
 	}
 
-	l = l.WithField("newEventID", event.EventID)
-
 	if err = loop.processEvent(event); err != nil {
 		return false, errors.Wrap(err, "failed to process event")
 	}
@@ -383,6 +382,8 @@ func (loop *eventLoop) processAddresses(log *logrus.Entry, addressEvents []*pmap
 			log.WithField("email", email).Debug("Address was deleted")
 			loop.user.CloseConnection(email)
 			loop.events.Emit(bridgeEvents.AddressChangedLogoutEvent, email)
+		case pmapi.EventUpdateFlags:
+			log.Error("EventUpdateFlags for address event is uknown operation")
 		}
 	}
 
@@ -411,6 +412,8 @@ func (loop *eventLoop) processLabels(eventLog *logrus.Entry, labels []*pmapi.Eve
 			if err := loop.store.deleteMailboxEvent(eventLabel.ID); err != nil {
 				return errors.Wrap(err, "failed to delete label")
 			}
+		case pmapi.EventUpdateFlags:
+			log.Error("EventUpdateFlags for label event is uknown operation")
 		}
 	}
 

internal/store/mailbox.go

@@ -254,7 +254,7 @@ func (storeMailbox *Mailbox) txGetAPIIDsBucket(tx *bolt.Tx) *bolt.Bucket {
 	return storeMailbox.txGetBucket(tx).Bucket(apiIDsBucket)
 }
 
-// txGetDeletedIDsBucket returns the bucket with messagesID marked as deleted
+// txGetDeletedIDsBucket returns the bucket with messagesID marked as deleted.
 func (storeMailbox *Mailbox) txGetDeletedIDsBucket(tx *bolt.Tx) *bolt.Bucket {
 	return storeMailbox.txGetBucket(tx).Bucket(deletedIDsBucket)
 }

internal/store/mailbox_message.go

@@ -25,7 +25,7 @@ import (
 )
 
 // ErrAllMailOpNotAllowed is error user when user tries to do unsupported
-// operation on All Mail folder
+// operation on All Mail folder.
 var ErrAllMailOpNotAllowed = errors.New("operation not allowed for 'All Mail' folder")
 
 // GetMessage returns the `pmapi.Message` struct wrapped in `StoreMessage`
@@ -67,10 +67,14 @@ func (storeMailbox *Mailbox) ImportMessage(msg *pmapi.Message, body []byte, labe
 	}
 
 	res, err := storeMailbox.client().Import([]*pmapi.ImportMsgReq{importReqs})
-	if err == nil && len(res) > 0 {
-		msg.ID = res[0].MessageID
+	if err != nil {
+		return err
 	}
-	return err
+	if len(res) == 0 {
+		return errors.New("no import response")
+	}
+	msg.ID = res[0].MessageID
+	return res[0].Error
 }
 
 // LabelMessages adds the label by calling an API.
@@ -173,7 +177,7 @@ func (storeMailbox *Mailbox) MarkMessagesUnstarred(apiIDs []string) error {
 }
 
 // MarkMessagesDeleted adds local flag \Deleted. This is not propagated to API
-// until RemoveDeleted is called
+// until RemoveDeleted is called.
 func (storeMailbox *Mailbox) MarkMessagesDeleted(apiIDs []string) error {
 	log.WithFields(logrus.Fields{
 		"messages": apiIDs,

internal/store/message.go

@@ -18,7 +18,10 @@
 package store
 
 import (
+	"bufio"
+	"bytes"
 	"net/mail"
+	"net/textproto"
 
 	pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
@@ -64,7 +67,7 @@ func (message *Message) Message() *pmapi.Message {
 }
 
 // IsMarkedDeleted returns true if message is marked as deleted for specific
-// mailbox
+// mailbox.
 func (message *Message) IsMarkedDeleted() bool {
 	isMarkedAsDeleted := false
 	err := message.storeMailbox.db().View(func(tx *bolt.Tx) error {
@@ -103,6 +106,8 @@ func (message *Message) SetSize(size int64) error {
 // header of decrypted message. This should not trigger any IMAP update.
 // NOTE: Content type depends on details of decrypted message which we want to
 // cache.
+//
+// Deprecated: Use SetHeader instead.
 func (message *Message) SetContentTypeAndHeader(mimeType string, header mail.Header) error {
 	message.msg.MIMEType = mimeType
 	message.msg.Header = header
@@ -121,6 +126,45 @@ func (message *Message) SetContentTypeAndHeader(mimeType string, header mail.Hea
 	return message.store.db.Update(txUpdate)
 }
 
+// SetHeader checks header can be parsed and if yes it stores header bytes in
+// database.
+func (message *Message) SetHeader(header []byte) error {
+	_, err := textproto.NewReader(bufio.NewReader(bytes.NewReader(header))).ReadMIMEHeader()
+	if err != nil {
+		return err
+	}
+	return message.store.db.Update(func(tx *bolt.Tx) error {
+		return tx.Bucket(headersBucket).Put([]byte(message.ID()), header)
+	})
+}
+
+// IsFullHeaderCached will check that valid full header is stored in DB.
+func (message *Message) IsFullHeaderCached() bool {
+	header, err := message.getRawHeader()
+	return err == nil && header != nil
+}
+
+func (message *Message) getRawHeader() (raw []byte, err error) {
+	err = message.store.db.View(func(tx *bolt.Tx) error {
+		raw = tx.Bucket(headersBucket).Get([]byte(message.ID()))
+		return nil
+	})
+	return
+}
+
+// GetHeader will return cached header from DB.
+func (message *Message) GetHeader() textproto.MIMEHeader {
+	raw, err := message.getRawHeader()
+	if err != nil && raw == nil {
+		return textproto.MIMEHeader(message.msg.Header)
+	}
+	header, err := textproto.NewReader(bufio.NewReader(bytes.NewReader(raw))).ReadMIMEHeader()
+	if err != nil {
+		return textproto.MIMEHeader(message.msg.Header)
+	}
+	return header
+}
+
 // SetBodyStructure stores serialized body structure in database.
 func (message *Message) SetBodyStructure(bs *pkgMsg.BodyStructure) error {
 	txUpdate := func(tx *bolt.Tx) error {
@@ -148,3 +192,17 @@ func (message *Message) GetBodyStructure() (bs *pkgMsg.BodyStructure, err error)
 	}
 	return bs, nil
 }
+
+func (message *Message) IncreaseBuildCount() (times uint32, err error) {
+	txUpdate := func(tx *bolt.Tx) error {
+		times, err = message.store.txIncreaseMsgBuildCount(
+			tx.Bucket(msgBuildCountBucket),
+			message.ID(),
+		)
+		return err
+	}
+	if err = message.store.db.Update(txUpdate); err != nil {
+		return 0, err
+	}
+	return times, nil
+}

internal/store/store.go

@@ -34,15 +34,15 @@ import (
 )
 
 const (
-	// PathDelimiter for IMAP
+	// PathDelimiter for IMAP.
 	PathDelimiter = "/"
-	// UserLabelsMailboxName for IMAP
+	// UserLabelsMailboxName for IMAP.
 	UserLabelsMailboxName = "Labels"
-	// UserLabelsPrefix contains name with delimiter for IMAP
+	// UserLabelsPrefix contains name with delimiter for IMAP.
 	UserLabelsPrefix = UserLabelsMailboxName + PathDelimiter
-	// UserFoldersMailboxName for IMAP
+	// UserFoldersMailboxName for IMAP.
 	UserFoldersMailboxName = "Folders"
-	// UserFoldersPrefix contains name with delimiter for IMAP
+	// UserFoldersPrefix contains name with delimiter for IMAP.
 	UserFoldersPrefix = UserFoldersMailboxName + PathDelimiter
 )
 
@@ -51,9 +51,13 @@ var (
 
 	// Database structure:
 	// * metadata
-	//   * {messageID} -> message data (subject, from, to, time, headers, body size, ...)
+	//   * {messageID} -> message data (subject, from, to, time, body size, ...)
+	// * headers
+	//   * {messageID} -> header bytes
 	// * bodystructure
 	//   * {messageID} -> message body structure
+	// * msgbuildcount
+	//   * {messageID} -> uint32 number of message builds to track re-sync issues
 	// * counts
 	//   * {mailboxID} -> mailboxCounts: totalOnAPI, unreadOnAPI, labelName, labelColor, labelIsExclusive
 	// * address_info
@@ -75,7 +79,9 @@ var (
 	//     * deleted_ids (can be missing or have no keys)
 	//       * {messageID} -> true
 	metadataBucket      = []byte("metadata")          //nolint[gochecknoglobals]
+	headersBucket       = []byte("headers")           //nolint[gochecknoglobals]
 	bodystructureBucket = []byte("bodystructure")     //nolint[gochecknoglobals]
+	msgBuildCountBucket = []byte("msgbuildcount")     //nolint[gochecknoglobals]
 	countsBucket        = []byte("counts")            //nolint[gochecknoglobals]
 	addressInfoBucket   = []byte("address_info")      //nolint[gochecknoglobals]
 	addressModeBucket   = []byte("address_mode")      //nolint[gochecknoglobals]
@@ -196,36 +202,24 @@ func openBoltDatabase(filePath string) (db *bolt.DB, err error) {
 	}
 
 	tx := func(tx *bolt.Tx) (err error) {
-		if _, err = tx.CreateBucketIfNotExists(metadataBucket); err != nil {
-			return
+		buckets := [][]byte{
+			metadataBucket,
+			headersBucket,
+			bodystructureBucket,
+			msgBuildCountBucket,
+			countsBucket,
+			addressInfoBucket,
+			addressModeBucket,
+			syncStateBucket,
+			mailboxesBucket,
+			mboxVersionBucket,
 		}
 
-		if _, err = tx.CreateBucketIfNotExists(bodystructureBucket); err != nil {
-			return
-		}
-
-		if _, err = tx.CreateBucketIfNotExists(countsBucket); err != nil {
-			return
-		}
-
-		if _, err = tx.CreateBucketIfNotExists(addressInfoBucket); err != nil {
-			return
-		}
-
-		if _, err = tx.CreateBucketIfNotExists(addressModeBucket); err != nil {
-			return
-		}
-
-		if _, err = tx.CreateBucketIfNotExists(syncStateBucket); err != nil {
-			return
-		}
-
-		if _, err = tx.CreateBucketIfNotExists(mailboxesBucket); err != nil {
-			return
-		}
-
-		if _, err = tx.CreateBucketIfNotExists(mboxVersionBucket); err != nil {
-			return
+		for _, bucket := range buckets {
+			if _, err = tx.CreateBucketIfNotExists(bucket); err != nil {
+				err = errors.Wrap(err, string(bucket))
+				return
+			}
 		}
 
 		return
@@ -263,7 +257,7 @@ func (store *Store) init(firstInit bool) (err error) {
 		}
 	}
 
-	store.log.WithField("mode", store.addressMode).Debug("Initialising store")
+	store.log.WithField("mode", store.addressMode).Info("Initialising store")
 
 	labels, err := store.initCounts()
 	if err != nil {

internal/store/store_test_exports.go

@@ -90,10 +90,7 @@ func (store *Store) TestDumpDB(tb assert.TestingT) {
 				return err
 			}
 		}
-		if err := txMails(tx); err != nil {
-			return err
-		}
-		return nil
+		return txMails(tx)
 	}
 
 	assert.NoError(tb, store.db.View(txDump))

internal/store/user_message.go

@@ -191,6 +191,19 @@ func (store *Store) txGetBodyStructure(bsBucket *bolt.Bucket, msgID string) (*pk
 	return pkgMsg.DeserializeBodyStructure(raw)
 }
 
+func (store *Store) txIncreaseMsgBuildCount(b *bolt.Bucket, msgID string) (uint32, error) {
+	key := []byte(msgID)
+	count := uint32(0)
+
+	raw := b.Get(key)
+	if raw != nil {
+		count = btoi(raw)
+	}
+
+	count++
+	return count, b.Put(key, itob(count))
+}
+
 // createOrUpdateMessageEvent is helper to create only one message with
 // createOrUpdateMessagesEvent.
 func (store *Store) createOrUpdateMessageEvent(msg *pmapi.Message) error {
@@ -276,7 +289,7 @@ func clearNonMetadata(onlyMeta *pmapi.Message) {
 // If there is stored message in metaBucket the size, header and MIMEType are
 // not changed if already set. To change these:
 // * size must be updated by Message.SetSize
-// * contentType and header must be updated by Message.SetContentTypeAndHeader
+// * contentType and header must be updated by Message.SetContentTypeAndHeader.
 func txUpdateMetadaFromDB(metaBucket *bolt.Bucket, onlyMeta *pmapi.Message, log *logrus.Entry) {
 	// Size attribute on the server is counting encrypted data. We need to compute
 	// "real" size of decrypted data. Negative values will be processed during fetch.

internal/transfer/mailbox.go

@@ -35,7 +35,7 @@ var systemFolderMapping = map[string]string{ //nolint[gochecknoglobals]
 	// Add more translations.
 }
 
-// LeastUsedColor is intended to return color for creating a new inbox or label
+// LeastUsedColor is intended to return color for creating a new inbox or label.
 func LeastUsedColor(mailboxes []Mailbox) string {
 	usedColors := []string{}
 	for _, m := range mailboxes {

internal/transfer/provider_imap.go

@@ -27,7 +27,7 @@ import (
 
 type IMAPClientProvider interface {
 	Capability() (map[string]bool, error)
-	Support(cap string) (bool, error)
+	Support(capability string) (bool, error)
 	State() imap.ConnState
 	SupportAuth(mech string) (bool, error)
 	Authenticate(auth sasl.Client) error

internal/transfer/provider_imap_utils.go

@@ -62,10 +62,10 @@ func imapClientDial(addr string) (IMAPClientProvider, error) {
 		client.ErrorLog = &imapErrorLogger{logrus.WithField("pkg", "imap-client")}
 		// Logrus `WriterLevel` fails for big messages because of bufio.MaxScanTokenSize limit.
 		// Also, this spams a lot, uncomment once needed during development.
-		//client.SetDebug(imap.NewDebugWriter(
+		// client.SetDebug(imap.NewDebugWriter(
 		//	logrus.WithField("pkg", "imap/client").WriterLevel(logrus.TraceLevel),
 		//	logrus.WithField("pkg", "imap/server").WriterLevel(logrus.TraceLevel),
-		//))
+		// ))
 	}
 	return client, err
 }
@@ -84,7 +84,7 @@ func imapClientDialHelper(addr string) (*imapClient.Client, error) {
 	var tlsConf *tls.Config
 	if strings.Contains(strings.ToLower(host), "yahoo") {
 		log.Warning("Yahoo server detected: limiting maximal TLS version to 1.2.")
-		tlsConf = &tls.Config{MaxVersion: tls.VersionTLS12}
+		tlsConf = &tls.Config{MaxVersion: tls.VersionTLS12} //nolint[gosec] G402
 	}
 	return imapClient.DialTLS(addr, tlsConf)
 }

internal/transfer/provider_mbox_target.go

@@ -63,7 +63,7 @@ func (p *MBOXProvider) writeMessage(msg Message) error {
 		}
 
 		mboxPath := filepath.Join(p.root, mboxName)
-		mboxFile, err := os.OpenFile(mboxPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
+		mboxFile, err := os.OpenFile(filepath.Clean(mboxPath), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
 		if err != nil {
 			multiErr = multierror.Append(multiErr, err)
 			continue

internal/transfer/provider_pmapi.go

@@ -21,16 +21,24 @@ import (
 	"sort"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
+	"github.com/ProtonMail/proton-bridge/pkg/message"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/pkg/errors"
 )
 
+const (
+	fetchWorkers  = 20 // In how many workers to fetch message (group list on IMAP).
+	attachWorkers = 5  // In how many workers to fetch attachments (for one message).
+	buildWorkers  = 20 // In how many workers to build messages.
+)
+
 // PMAPIProvider implements import and export to/from ProtonMail server.
 type PMAPIProvider struct {
 	clientManager ClientManager
 	userID        string
 	addressID     string
 	keyRing       *crypto.KeyRing
+	builder       *message.Builder
 
 	nextImportRequests     map[string]*pmapi.ImportMsgReq // Key is msg transfer ID.
 	nextImportRequestsSize int
@@ -44,6 +52,7 @@ func NewPMAPIProvider(clientManager ClientManager, userID, addressID string) (*P
 		clientManager: clientManager,
 		userID:        userID,
 		addressID:     addressID,
+		builder:       message.NewBuilder(fetchWorkers, attachWorkers, buildWorkers),
 
 		nextImportRequests:     map[string]*pmapi.ImportMsgReq{},
 		nextImportRequestsSize: 0,

internal/transfer/provider_pmapi_source.go

@@ -18,12 +18,13 @@
 package transfer
 
 import (
+	"context"
+	"errors"
 	"fmt"
 	"sync"
 
-	pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ProtonMail/proton-bridge/pkg/message"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
@@ -144,6 +145,7 @@ func (p *PMAPIProvider) transferTo(rule *Rule, progress *Progress, ch chan<- Mes
 
 func (p *PMAPIProvider) exportMessage(rule *Rule, progress *Progress, pmapiMsgID, msgID string, skipEncryptedMessages bool) (Message, error) {
 	var msg *pmapi.Message
+
 	progress.callWrap(func() error {
 		var err error
 		msg, err = p.getMessage(pmapiMsgID)
@@ -153,19 +155,18 @@ func (p *PMAPIProvider) exportMessage(rule *Rule, progress *Progress, pmapiMsgID
 	p.timeIt.start("build", msgID)
 	defer p.timeIt.stop("build", msgID)
 
-	msgBuilder := pkgMsg.NewBuilder(p.client(), msg)
-	msgBuilder.EncryptedToHTML = false
-	_, body, err := msgBuilder.BuildMessage()
+	body, err := p.builder.NewJobWithOptions(
+		context.Background(),
+		p.client(),
+		msg.ID,
+		message.JobOptions{IgnoreDecryptionErrors: !skipEncryptedMessages},
+	).GetResult()
 	if err != nil {
-		return Message{
-			Body: body, // Keep body to show details about the message to user.
-		}, errors.Wrap(err, "failed to build message")
-	}
+		if errors.Is(err, message.ErrDecryptionFailed) && skipEncryptedMessages {
+			err = errors.New("skipping encrypted message")
+		}
 
-	if !msgBuilder.SuccessfullyDecrypted() && skipEncryptedMessages {
-		return Message{
-			Body: body, // Keep body to show details about the message to user.
-		}, errors.New("skipping encrypted message")
+		return Message{Body: []byte(msg.Body)}, err
 	}
 
 	unread := false

internal/transfer/provider_pmapi_target.go

@@ -329,10 +329,10 @@ func (p *PMAPIProvider) importMessage(msgSourceID string, progress *Progress, re
 		}
 		if results[0].Error != nil {
 			importedErr = errors.Wrap(results[0].Error, "failed to import message")
-			return nil // Call passed but API refused this message, skip this one.
+			return nil //nolint[nilerr] Call passed but API refused this message, skip this one.
 		}
 		importedID = results[0].MessageID
 		return nil
 	})
-	return
+	return importedID, importedErr
 }

internal/transfer/provider_test.go

@@ -85,7 +85,7 @@ func testTransferFrom(t *testing.T, rules transferRules, provider TargetProvider
 		progress.finish()
 	}()
 
-	maxWait := time.Duration(len(messages)) * 2 * time.Second
+	maxWait := time.Duration(len(messages)*2) * time.Second
 	a.Eventually(t, func() bool {
 		return progress.updateCh == nil
 	}, maxWait, 10*time.Millisecond, "Waiting for imported messages timed out")