chore: Trift Bridge 3.4.2 changelog.

fix(GODT-2902): do not check for changed values. Related to GODT-2857.
2025-12-10 12:46:46 +00:00 · 2023-09-01 15:12:34 +02:00 · 2023-09-01 14:44:27 +02:00
761 changed files with 18696 additions and 48128 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -16,37 +16,230 @@
 # along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 ---
-default:
+image: gitlab.protontech.ch:4567/go/bridge-internal:test-go1.20
  tags:
    - shared-small
 variables:
  GOPRIVATE: gitlab.protontech.ch
  GOMAXPROCS: $(( ${CI_TAG_CPU} / 2 ))
 before_script:
-  - |
+  - apt update && apt-get -y install libsecret-1-dev
-    if [ "$CI_JOB_NAME" != "grype-scan-code-dependencies" ]; then
+  - git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
      apt update && apt-get -y install libsecret-1-dev
      git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
    fi
 stages:
  - analyse
  - test
  - build
-include:
+.rules-branch-and-MR-manual:
-  - local: ci/setup.yml
+  rules:
-  - local: ci/rules.yml
+    - if: $CI_COMMIT_BRANCH ||  $CI_PIPELINE_SOURCE == "merge_request_event"
-  - local: ci/env.yml
+      when: manual
-  - local: ci/test.yml
+      allow_failure: true
-  - local: ci/build.yml
+    - when: never
  - component: gitlab.protontech.ch/proton/devops/cicd-components/devsecops/gitleaks/scan-repository@~latest
    inputs: 
      stage: analyse
      cli-args: "--baseline-path $GITLEAKS_BASELINE"
  - component: gitlab.protontech.ch/proton/devops/cicd-components/devsecops/grype/scan-code@~latest
    inputs:
      stage: analyse
 .rules-branch-manual-MR-and-devel-always:
  rules:
    - if: $CI_COMMIT_BRANCH == "devel" || $CI_PIPELINE_SOURCE == "merge_request_event"
      when: always
      allow_failure: false
    - if: $CI_COMMIT_BRANCH
      when: manual
      allow_failure: true
    - when: never
 # ENV
 .env-windows:
  before_script:
    - export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
    - export GOROOT=/c/Go1.20/
    - export PATH=$GOROOT/bin:$PATH
    - export GOARCH=amd64
    - export GOPATH=~/go1.20
    - export GO111MODULE=on
    - export PATH="${GOPATH}/bin:${PATH}"
    - export MSYSTEM=
    - export QT6DIR=/c/grrrQt/6.3.2/msvc2019_64
    - export PATH=$PATH:${QT6DIR}/bin
    - export PATH="/c/Program Files/Microsoft Visual Studio/2022/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH"
    - $(git config --global -l | grep -o 'url.*gitlab.protontech.ch.*insteadof' | xargs -L 1 git config --global --unset &> /dev/null) || echo "nothing to remove"
    - git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
    - git config --global safe.directory '*'
    - git status --porcelain
  cache: {}
  tags:
    - windows-bridge
 .env-darwin:
  before_script:
    - export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
    - export PATH=/usr/local/bin:$PATH
    - export PATH=/usr/local/opt/git/bin:$PATH
    - export PATH=/usr/local/opt/make/libexec/gnubin:$PATH
    - export PATH=/usr/local/opt/gnu-sed/libexec/gnubin:$PATH
    - export GOROOT=~/local/opt/go@1.20
    - export PATH="${GOROOT}/bin:$PATH"
    - export GOPATH=~/go1.20
    - export PATH="${GOPATH}/bin:$PATH"
    - export QT6DIR=/opt/Qt/6.3.2/macos
    - export PATH="${QT6DIR}/bin:$PATH"
    - uname -a
  cache: {}
  tags:
    - macos-m1-bridge
 .env-linux-build:
  image: gitlab.protontech.ch:4567/go/bridge-internal:build-go1.20-qt6.3.2
  variables:
    VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
  cache:
    key: linux-vcpkg
    paths:
      - .cache
    when: 'always'
  before_script:
    - mkdir -p .cache/bin
    - export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
    - export PATH=$(pwd)/.cache/bin:$PATH
    - export GOPATH="$CI_PROJECT_DIR/.cache"
    - export PATH=$PATH:$QT6DIR/bin
    - $(git config --global -l | grep -o 'url.*gitlab.protontech.ch.*insteadof' | xargs -L 1 git config --global --unset &> /dev/null) || echo "nothing to remove"
    - git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
  tags:
    - large
 # Stage: TEST
 lint:
  stage: test
  extends:
    - .rules-branch-manual-MR-and-devel-always
  script:
    - make lint
  tags:
    - medium
 .script-test:
  stage: test
  extends:
    - .rules-branch-manual-MR-and-devel-always
  script:
    - make test
  artifacts:
    paths:
      - coverage/**
 test-linux:
  extends:
    - .script-test
  tags:
    - large
 test-linux-race:
  extends:
    - test-linux
    - .rules-branch-and-MR-manual
  script:
    - make test-race
 test-integration:
  extends:
    - test-linux
  script:
    - make test-integration
 test-integration-race:
  extends:
    - test-integration
    - .rules-branch-and-MR-manual
  script:
    - make test-integration-race
 test-windows:
  extends:
    - .env-windows
    - .script-test
    - .rules-branch-and-MR-manual
 test-darwin:
  extends:
    - .env-darwin
    - .script-test
 test-coverage:
  stage: test
  extends:
    - .rules-branch-manual-MR-and-devel-always
  script:
    - ./utils/coverage.sh
  coverage: '/total:.*\(statements\).*\d+\.\d+%/'
  needs:
    - test-linux
    #- test-windows
    - test-darwin
    - test-integration
  tags:
    - small
  artifacts:
    paths:
      - coverage*
      - coverage/**
    when: 'always'
    reports:
      coverage_report:
        coverage_format: cobertura
        path: coverage.xml
 # Stage: BUILD
 .script-build:
  stage: build
  needs: ["lint"]
  extends:
    - .rules-branch-and-MR-manual
  script:
    - make build
    - git diff && git diff-index --quiet HEAD
    - make vault-editor
  artifacts:
    expire_in: 1 day
    when: always
    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
    paths:
      - bridge_*.tgz
      - vault-editor
 build-linux:
  extends:
    - .script-build
    - .env-linux-build
 build-linux-qa:
  extends:
    - build-linux
    - .rules-branch-manual-MR-and-devel-always
  variables:
    BUILD_TAGS: "build_qa"
 build-darwin:
  extends:
    - .script-build
    - .env-darwin
 build-darwin-qa:
  extends:
    - build-darwin
  variables:
    BUILD_TAGS: "build_qa"
 build-windows:
  extends:
    - .script-build
    - .env-windows
 build-windows-qa:
  extends:
    - build-windows
  variables:
    BUILD_TAGS: "build_qa"
 # TODO: PUT BACK ALL THE JOBS! JUST DID THIS FOR NOW TO GET CI WORKING AGAIN...
--- a/.grype.yaml
+++ b/.grype.yaml
@ -1,2 +0,0 @@
 # Check out for configuration details: https://github.com/anchore/grype?tab=readme-ov-file#configuration
 fail-on-severity: "medium"
--- a/BUILDS.md
+++ b/BUILDS.md
@ -3,14 +3,14 @@
 ## Prerequisites
 * 64-bit OS:
    - the go-rfc5322 module cannot currently be compiled for 32-bit OSes
-* Go 1.21.9
+* Go 1.20
 * Bash with basic build utils: make, gcc, sed, find, grep, ...
  - For Windows, it is recommended to use MinGW 64bit shell from [MSYS2](https://www.msys2.org/)
 * GCC (Linux), msvc (Windows) or Xcode (macOS)
 * Windres (Windows)
 * libglvnd and libsecret development files (Linux)
 * pkg-config (Linux)
-* cmake, ninja-build and Qt 6.4.3 are required to build the graphical user interface. On Linux, 
+* cmake, ninja-build and Qt 6 are required to build the graphical user interface. On Linux, 
 the Mesa OpenGL development files are also needed.
 To enable the sending of crash reports using Sentry please set the
@ -19,7 +19,7 @@ Otherwise, the sending of crash reports will be disabled.
 ## Build
 In order to build Bridge app with Qt interface we are using
-[Qt 6.4.3](https://doc.qt.io/qt-6/gettingstarted.html).
+[Qt 6.3](https://doc.qt.io/qt-6/gettingstarted.html).
 Please note that qmake path must be in your `PATH` to ensure Qt to be found.
 Also, before you start build **on Windows**, please unset the `MSYSTEM` variable
--- a/COPYING_NOTES.md
+++ b/COPYING_NOTES.md
@ -40,7 +40,6 @@ Proton Mail Bridge includes the following 3rd party software:
 * [go-message](https://github.com/emersion/go-message) available under [license](https://github.com/emersion/go-message/blob/master/LICENSE) 
 * [go-sasl](https://github.com/emersion/go-sasl) available under [license](https://github.com/emersion/go-sasl/blob/master/LICENSE) 
 * [go-smtp](https://github.com/emersion/go-smtp) available under [license](https://github.com/emersion/go-smtp/blob/master/LICENSE) 
 * [go-vcard](https://github.com/emersion/go-vcard) available under [license](https://github.com/emersion/go-vcard/blob/master/LICENSE) 
 * [color](https://github.com/fatih/color) available under [license](https://github.com/fatih/color/blob/master/LICENSE) 
 * [sentry-go](https://github.com/getsentry/sentry-go) available under [license](https://github.com/getsentry/sentry-go/blob/master/LICENSE) 
 * [resty](https://github.com/go-resty/resty/v2) available under [license](https://github.com/go-resty/resty/v2/blob/master/LICENSE) 
@ -50,7 +49,6 @@ Proton Mail Bridge includes the following 3rd party software:
 * [uuid](https://github.com/google/uuid) available under [license](https://github.com/google/uuid/blob/master/LICENSE) 
 * [go-multierror](https://github.com/hashicorp/go-multierror) available under [license](https://github.com/hashicorp/go-multierror/blob/master/LICENSE) 
 * [html2text](https://github.com/jaytaylor/html2text) available under [license](https://github.com/jaytaylor/html2text/blob/master/LICENSE) 
 * [go-locale](https://github.com/jeandeaual/go-locale) available under [license](https://github.com/jeandeaual/go-locale/blob/master/LICENSE) 
 * [go-keychain](https://github.com/keybase/go-keychain) available under [license](https://github.com/keybase/go-keychain/blob/master/LICENSE) 
 * [dns](https://github.com/miekg/dns) available under [license](https://github.com/miekg/dns/blob/master/LICENSE) 
 * [memory](https://github.com/pbnjay/memory) available under [license](https://github.com/pbnjay/memory/blob/master/LICENSE) 
@ -85,6 +83,7 @@ Proton Mail Bridge includes the following 3rd party software:
 * [go-spew](https://github.com/davecgh/go-spew) available under [license](https://github.com/davecgh/go-spew/blob/master/LICENSE) 
 * [go-windows](https://github.com/elastic/go-windows) available under [license](https://github.com/elastic/go-windows/blob/master/LICENSE) 
 * [go-textwrapper](https://github.com/emersion/go-textwrapper) available under [license](https://github.com/emersion/go-textwrapper/blob/master/LICENSE) 
 * [go-vcard](https://github.com/emersion/go-vcard) available under [license](https://github.com/emersion/go-vcard/blob/master/LICENSE) 
 * [fgprof](https://github.com/felixge/fgprof) available under [license](https://github.com/felixge/fgprof/blob/master/LICENSE) 
 * [go-shlex](https://github.com/flynn-archive/go-shlex) available under [license](https://github.com/flynn-archive/go-shlex/blob/master/LICENSE) 
 * [mimetype](https://github.com/gabriel-vasile/mimetype) available under [license](https://github.com/gabriel-vasile/mimetype/blob/master/LICENSE) 
@ -124,7 +123,6 @@ Proton Mail Bridge includes the following 3rd party software:
 * [codec](https://github.com/ugorji/go/codec) available under [license](https://github.com/ugorji/go/codec/blob/master/LICENSE) 
 * [tagparser](https://github.com/vmihailenco/tagparser/v2) available under [license](https://github.com/vmihailenco/tagparser/v2/blob/master/LICENSE) 
 * [smetrics](https://github.com/xrash/smetrics) available under [license](https://github.com/xrash/smetrics/blob/master/LICENSE) 
 * [go-ordered-json](https://gitlab.com/c0b/go-ordered-json)
 * [arch](https://golang.org/x/arch) available under [license](https://cs.opensource.google/go/x/arch/+/master:LICENSE) 
 * [crypto](https://golang.org/x/crypto) available under [license](https://cs.opensource.google/go/x/crypto/+/master:LICENSE) 
 * [mod](https://golang.org/x/mod) available under [license](https://cs.opensource.google/go/x/mod/+/master:LICENSE) 
@ -132,8 +130,7 @@ Proton Mail Bridge includes the following 3rd party software:
 * [tools](https://golang.org/x/tools) available under [license](https://cs.opensource.google/go/x/tools/+/master:LICENSE) 
 * [genproto](https://google.golang.org/genproto) available under [license](https://pkg.go.dev/google.golang.org/genproto?tab=licenses) 
 * [yaml](https://gopkg.in/yaml.v3) available under [license](https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE) 
 * [docker-credential-helpers](https://github.com/ProtonMail/docker-credential-helpers) available under [license](https://github.com/ProtonMail/docker-credential-helpers/blob/master/LICENSE) 
 * [go-message](https://github.com/ProtonMail/go-message) available under [license](https://github.com/ProtonMail/go-message/blob/master/LICENSE) 
 * [go-smtp](https://github.com/ProtonMail/go-smtp) available under [license](https://github.com/ProtonMail/go-smtp/blob/master/LICENSE) 
 * [resty](https://github.com/LBeernaertProton/resty/v2) available under [license](https://github.com/LBeernaertProton/resty/v2/blob/master/LICENSE) 
 * [go-keychain](https://github.com/cuthix/go-keychain) available under [license](https://github.com/cuthix/go-keychain/blob/master/LICENSE) 
 <!-- END AUTOGEN -->
--- a/Changelog.md
+++ b/Changelog.md
@ -3,379 +3,10 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
-## Bastei Bridge 3.12.0
+## Trift Bridge 3.4.2
 ### Added
 * BRIDGE-75: Bridge repair button.
 * BRIDGE-79: Add New Outlook for Mac KB disclaimer.
 ### Changed
 * BRIDGE-16: Bump version Go 1.21.9 Qt 6.4.3.
 * BRIDGE-23: Update gluon to go 1.21.
 * BRIDGE-22: Update gpa to go 1.21.
 ### Fixed
-* BRIDGE-90: Disable repair button when bridge cannot connect to proton servers; bump GPA.
+* GODT-2902: Do not check for changed values. Related to GODT-2857.
 * BRIDGE-69: Explicitly handle semver panic for last bridge version from vault.
 * BRIDGE-29: Bump gluon version.
 * BRIDGE-49: Configure gitleaks baseline and grype config.
 * BRIDGE-21: Missing panic handling.
 * BRIDGE-17: Broken telemetry heartbeat test.
 * BRIDGE-10: Bumped gluon version.
 ## Alcantara Bridge 3.11.1
 ### Fixed
 * BRIDGE-70: Hotfix for blocked smtp/imap port causing bridge to quit.
 ## Alcantara Bridge 3.11.0
 ### Added
 * GODT-3185: Report cases which leads to wrong address key used.
 ### Changed
 * BRIDGE-14: HV3 implementation.
 * BRIDGE-15: Certificate install is now also done during Outlook setup on macOS.
 * GODT-3146: Start servers on startup, keep running even when no users are active.
 * BRIDGE-19: Update checksum validation use warning instead of error on non-existing files.
 ### Fixed
 * BRIDGE-8: Fix bridge double sessionID issue in logs.
 * BRIDGE-7: Modify keychain test on macOS.
 * BRIDGE-4: Logs not being created when invalid flag is passed.
 * BRIDGE-5: Add tooltip to tray icon.
 * GODT-3163: Filter MBOX format delimiter.
 ## Zaehringen Bridge 3.10.0
 ### Added
 * GODT-3199: Add package log field.
 * GODT-3220: Add more test scenarios.
 ### Changed
 * GODT-3193: Preserve attachment encoding.
 * GODT-3214: Encrypt only with primary key.
 * GODT-2662: Use tart runner for darwin jobs.
 * GODT-1602: Test: run integration tests against black 🖤.
 * GODT-3257: Test: quad9 provider test not working on CI.
 ### Fixed
 * GODT-3290: Fix test failing because of leap day.
 ## Ypsilon Bridge 3.9.1
 ### Fixed
 * GODT-3235: Update bridge update key.
 ## Ypsilon Bridge 3.9.0
 ### Added
 * GODT-3230: Scripts for removing Bridge from device.
 * GODT-3195: Add OS info to the log.
 * GODT-3156: Add time zone info to the bridge log.
 * GODT-3162: Test: Add test scenarios for KB article suggestions.
 * Test: Add scenarios for checking messages sent from Web Client.
 * GODT-3162: Test: Add step definition for checking KB article suggestions.
 ### Changed
 * GODT-3160: Bump version Go 1.21.6.
 * GODT-3160: Load pipeline env from bridge internal.
 * GODT-3052: Test: Replace attachments and inline content in feature tests with the smallest valid versions.
 * GODT-3155: Customize log formatter for easier parsing.
 * GODT-3172: Detect missing keychain item.
 * GODT-3172: Do not list, just retrieve vault key.
 * Log the message received time when handling message creation event.
 * Set log as artefact for all integration test.
 * Get better logging arround keychain list initialisation.
 ### Fixed
 * GODT-3229: Escape reserved XML characters in Apple configuration profile.
 * GODT-3228: Get rid of fork of docker-credential-helpers.
 * GODT-3176: Assume inline if content id is present.
 * GODT-3160: Ignore non-called vulnerabilities.
 * GODT-3160: Updated external dependencies reported by govulncheck.
 * GODT-3203: Crash in chunkDivide.
 * Fix for SMTP connection mode toggle in bridge-gui-tester.
 * GODT-3183: Fix database indices.
 * GODT-3187: Fix numberOfDay computation when changing year and day.
 * GODT-3188: Happy new year.
 ## Xikou Bridge 3.8.2
 ### Fixed
 * GODT-3235: Update bridge update key.
 ## Xikou Bridge 3.8.1
 ### Added
 * GODT-3121: Suggest relevant KB articles in the in-app bug report form.
 * GODT-2001: Add govulncheck to scan for vulnerabilities.
 ### Changed
 * Keep nighlty-job log as artifact.
 * Test: Improve TestMetadata_JobCorrectlyFinishesAfterCancel.
 ### Fixed
 * GODT-3153: Do not take into account full address when hasing messages.
 ## Xikou Bridge 3.8.0
 ### Added
 * Test: Add test scenarios to add an /Answered flag to a replied message and revert.
 * GODT-3046: Added links to KB in error messages.
 * Test(GODT-3113): Inline HTML message and HTML attachment is getting altered.
 * Test(GODT-3124): Attempt to fix 401 during login.
 ### Changed
 * GODT-3134: Br tag triggers installer.
 * Added update events to bridge GUI tester.
 ### Fixed
 * GODT-3142: Pass br tag if available.
 * GODT-3151: Fix feature test with non modified HTML part.
 * GODT-3151: Only modify HTML Meta content if UTF-8 charset override is needed.
 * GODT-2851: Add empty text part if no text part when importing multipart.
 * GODT-3102: Distinguish Vault Decryption from Serialization Errors.
 * GODT-3124: Handling of sync child jobs.
 * GODT-3148: Bump go-sysinfo to get rid of linker warning on macOS Sonoma.
 * GODT-3124: Flaky tests.
 * GODT-3022: Handle multipart/related on fake server.
 * GODT-3133: Fix GetSystemLanguage.
 * GODT-3124: Race condition in sync task waiter.
 * GODT-3124: Race conditions reported by race check.
 * GODT-2797: Encode attached key name and use same pubkey name as web-app.
 * Fix case of IMAP login error.
 * GODT-3132: Do not allow sending on disabled accounts.
 * GODT-3046: fix typo spotted during KB article review.
 * GODT-3129: Bad Event during after address order change.
 * GODT-3117: Improve GetAllContacts and GetAllContactsEmail.
 ## Wakato Bridge 3.7.1
 ### Added
 * Test(GODT-2740): Sending Plain text messages to internal recipient.
 * Test(GODT-2892): Create fake log file.
 * GODT-3122: Added test, changed interface for accessing display name.
 ### Changed
 * Remove debug prints.
 * GODT-2576: Forward and $Forward Flag Support.
 * GODT-3053: Use smaller bridge window on small screens.
 * GODT-3113: Only force UTF-8 charset for HTML part when needed.
 * GODT-3113: Do not render HTML for attachment.
 * GODT-3112: Replaced error message when bridge exists prematurely. Added a link to support form.
 * GODT-2947: Remove 'blame it on the weather' error part from go-smtp.
 * GODT-3010: Log MimeType parsing issue.
 * GODT-3104: Added log entry for cert install status on startup on macOS.
 * GODT-2277: Move Keychain helpers creation in main.
 ### Fixed
 * GODT-3054: Only delete drafts after message has been Sent.
 * GODT-2576: Correctly handle Forwarded messages from Thunderbird.
 * GODT-3122: Use display name as 'Email Account Name' in macOS profile.
 * GODT-3125: Heartbeat crash on exit.
 * GODT-2617: Validate user can send from the SMTP sender address.
 * GODT-3123: Trigger bad event on empty EventID on existing accounts.
 * GODT-3118: Do not reset EventID when migrating sync settings.
 * GODT-3116: Panic on closed channel.
 * GODT-1623: Throttle SMTP failed requests.
 * GODT-3047: Fixed 'disk full' error message.
 * GODT-3054: Delete draft create from reply.
 * GODT-3048: WKD Policy behavior.
 ## Wakato Bridge 3.7.0
 ### Added
 * Test(GODT-1224): Add testing around package creation.
 * Add debug_assemble binary.
 * Test(GODT-2723): Add importing a message with remote content.
 * Test(GODT-2737): Sending HTML messages to internal.
 * Test(GODT-3036): Keep inline attachment order on GPA Fake Server.
 * GODT-3015: Add simple algorithm to deal with multiple attachment for bug report.
 * Test: make message structure check more verbose.
 * Test: Add test around account settings.
 ### Changed
 * GODT-3097: Warn about PGPInline encryption scheme which will be deprecated.
 * Test: Support multiple users when waiting for sync event.
 * Test: Update fake server with defautl draft content-type and test it.
 * Test: be less aggressive while checking for message structure.
 * GODT-2996: Set password fields to hidden when resetting the login form.
 * GODT-2990: Change runner tags.
 * GODT-2835: Bump GPA adding support for AsyncAttachments for BugReport +...
 * GODT-2940: Allow 3 attempts for mailbox password.
 * GODT-3095: Update GOpenPGP.
 ### Fixed
 * GODT-3106: Broken import route.
 * GODT-3041: Fix Invalid Or Missing message signature during send.
 * GODT-3087: Exclude attachment content-disposition part when determining...
 * GODT-2887: Inline images with Apple Mail.
 * GODT-3100: Fix issue where a fatal error that bubble up to cli.Run() is not written in the log file.
 * GODT-3094: Clean up old update files on bridge startup.
 * GODT-3012: Fix multipart request retries.
 * GODT-2935: Do not allow parentID into drafts.
 * GODT-2935: Correct error message when draft fails to create.
 * GODT-2970: Correctly handle rename of Inbox.
 * GODT-2969: Prevent duration corruption for config status event.
 * Fixed type in QA installer CI job name.
 * GODT-3019: Fix title of main window when no account is connected.
 * GODT-3013: IMAP service getting "stuck".
 * GODT-2966: Allow permissive parsing of MediaType parameters for import.
 * GODT-2966: Add more test regarding quoted/unquoted filename in attachment.
 * GODT-2490: Fix sync progress not being reset when toggling split mode.
 * GODT-2515: Customized notification of unavailable keychain on macOS.
 ## Vasco da Gama Bridge 3.6.1
 ### Fixed
 * GODT-3033: Unable to receive new mail.
 ## Umshiang Bridge 3.5.4
 ### Fixed
 * GODT-3033: Unable to receive new mail.
 ## Vasco da Gama Bridge 3.6.0
 ### Added
 * GODT-2762: Setup wizard.
 * GODT-2772: Setup wizard content.
 * GODT-2769: Setup Wizard architecture.
 * GODT-2767: Setup Wizard foundations.
 * GODT-2725: Implement receive message step with expected structure exposed.
 ### Changed
 * GODT-2960: Added content in empty view when there is no account.
 * GODT-2771: Cert related tools for macOS.
 * GODT-2770: Proof of concept for web view as a tool window and overlay (not used).
 * GODT-2916: Split Decryption from Message Building.
 * GODT-2597: Implement contact specific settings in integration tests.
 * GODT-2664: Trigger QA installer.
 ### Fixed
 * GODT-2992: Fix link in 'no account view' in main window after 2FA or TOTP are cancelled.
 * GODT-2989: Allow to send bug report when no account connected.
 * GODT-2988: Fix setup wizard KB links.
 * GODT-2968: Use proper base64 encoded string even for bad password test.
 * GODT-2965: Fix multipart/mixed testdata + structure parsing steps related to this.
 * GODT-2932: Fix syncing not being reported in GUI.
 * GODT-2967: Tray menu entries close the setup wizard when needed.
 * GODT-2212: Preserver Header order in message building.
 * Fixed missing GoOs gRPC call in bridge-gui-tester.
 * GODT-2929: Message dedup with different text transfer encoding.
 ## Umshiang Bridge 3.5.3
 ### Changed
 * GODT-3004: Update gopenpgp and dependencies.
 ## Umshiang Bridge 3.5.2
 ### Fixed
 * GODT-3003: Ensure IMAP State is reset after vault corruption.
 * GODT-3001: Only create system labels during system label sync.
 ## Umshiang Bridge 3.5.1
 ### Fixed
 * GODT-2963: Use multi error to report file removal errors.
 * GODT-2956: Restore old deletion rules.
 * GODT-2951: Negative WaitGroup Counter.
 * GODT-2590: Fix send on closed channel.
 * GODT-2949: Fix close of close channel in event service.
 ## Umshiang Bridge 3.5.0
 ### Added
 * GODT-2734: Add testing steps to modify account settings.
 * GODT-2746: Integration tests for reporting a problem.
 * GODT-2891: Allow message create & delete during sync.
 * GODT-2848: Decouple IMAP service from Event Loop.
 * Add trace profiling option.
 * GODT-2829: New Sync Service.
 * Test: oss-fuzz support for fuzzing.
 * GODT-2799: SMTP Service.
 * GODT-2800: User Event Service.
 * GODT-2801: Identity Service.
 * GODT-2802: IMAP Serivce.
 * GODT-2788: Add preview to bug report validation and JSON file validator.
 * GODT-2803: Bridge Database access.
 ### Changed
 * GODT-2909: Remove Timeout on event publish.
 * GODT-2913: Reduce the number of configuration failure detected.
 * GODT-2828: Increase sync progress report frequency.
 * Test: Fix TestBridge_SyncWithOnGoingEvents.
 * GODT-2871: Is telemetry enabled as service.
 * Test(GODT-2873): Wait for Gluon Watcher to finish.
 * Test(GODT-2744): Add integration tests for moving messages (with MOVE support).
 * Test(GODT-2872): Fix nightly job.
 * Test(GODT-2742): Add more integration tests regarding drafts.
 * GODT-2787: Force Scrollview to top when re-opening questions set.
 * GODT-2787: Tweaking Bug Report form with last Review.
 * Ci(GODT-2717): Create a job that will run on schedule.
 * GODT-2787: Fix vertical alignement on CategoryItem.
 * GODT-2842: Implement Bug Report Fallback notification.
 * Chore(GODT-2848): Simplify User Event Service.
 * GODT-2808: Apply comment from Bug Report content review.
 * Test(GODT-2743): Sync high number of messages.
 * GODT-2814: Standalone Server Manager.
 * GODT-2808: Initial list of categories and questions.
 * GODT-2787: Replace the PathTracker by a more visual NavigationIndicator.
 * GODT-2816: Wait until mandatory fields are filled then fill body and title.
 * GODT-2794: Clear cached answers when report is sent.
 * GODT-2793: Feed the bug report body with the answered questions.
 * GODT-2791: Parse the Bug Report Flow description file and ensure forward compatibility (GODT-2789).
 * GODT-2821: Display questions in one page.
 * GODT-2786: Init bug report flow description file.
 * GODT-2792: Implement display of question set for bug report.
 * Use qmlformat on qml files, and removed deprecated tests.
 ### Fixed
 * GODT-2828: Fix negative report time.
 * GODT-2828: Fix sync progress report after restart.
 * GODT-2867: Do not crash on timeout or context cancel.
 * GODT-2693: Duplicate messages in sent folder.
 * GODT-2867: Get attachment returns API error on network problem.
 * GODT-2805: Ignore Contact Group Labels.
 * GODT-2866: Add 429/5xx Retry to Event Service.
 * GODT-2855: Fix for text overlapping in settings view.
 * Test: Verify leaks at end of WithEnv.
 * Test: Fix event registration in TestBridge_SyncWithOngoingEvents.
 * Test: Fix deadlock in chToType.
 * GODT-2865: Add error on failed unlock.
 * GODT-2857: Do not check changed values in clear recent flag.
 * GODT-2827: Restore ticker to event poller.
 * Test: TestBridge_SendAddTextBodyPartIfNotExists eventually fix.
 * GODT-2813: Write new vault to temporary file first.
 * GODT-2807: Fix issue where sessionID would not be removed from command-line on restart by bridge-gui.
 * GODT-2687: Tabs after header field colon.
 * GODT-2764: Allow perma-delete for messages which still have labels.
 * GODT-2693: Fix message appearing twice after sent.
 * GODT-2781: Try to remove stale lock file before failing in checkSingleInstance.
 * GODT-2780: Fix 'QSystemTrayIcon::setVisible: No Icon set' warning in bridge-gui log on startup.
 * GODT-2778: Fix login screen being disabled after an 'already logged in' error.
 * Fix typos found by codespell.
 * GODT-2577: Answered flag should only be applied to replied messages.
 ## Trift Bridge 3.4.1
@ -424,7 +55,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-2578: Refresh literals appended to Sent folder.
 * GODT-2753: Vault test now check that value auto-assigned is first available port.
 * GODT-2522: Handle migration with unreferenced db values.
-* GODT-2670: Allow missing whitespace after header field colon.
+* GODT-2693: Allow missing whitespace after header field colon.
 * GODT-2653: Only log when err is not nil.
 * GODT-2680: Fix for C++ debugger not working on ARM64 because of OpenSSL 3.1.
 * GODT-2675: Update GPA to applye togin-gonic/gin patch + update COPYING_NOTES.
@ -509,7 +140,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-2437: Silence harmless report to sentry.
 * GODT-2649: Clean up cache files after failed connector create (Gluon).
 * GODT-2638: Validate messages before import.
-* GODT-2646: Bump GPA and Gluon dependency after CIRCL upgrade.
+* GODT-2646: Bump GPA and Gluon dependecy after CIRCL upgrade.
 * GODT-2454: Only Send status update if transaction succeeded.
 * Test: fix flaky tests.
 * GODT-2628: Attempt to fix closed channel panic on logout.
@ -569,7 +200,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-2574: Fix label/unlabel of large amounts of messages.
 * GODT-2573: Handle invalid header fields in message.
 * GODT-2573: Crash on null update.
-* GODT-2407: Replace invalid email addresses with empty for new Drafts.
+* GODT-2407: Replace invalid email addresses with emtpy for new Drafts.
 ## [Bridge 3.1.3] Quebec
@ -710,7 +341,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-2429: Do not report context cancel to sentry.
 ### Fixed
-* GODT-2467: elide long email addresses in 'bad event' QML notification dialog.
+* GODT-2467: elide long email adresses in 'bad event' QML notification dialog.
 * GODT-2449: fix bug in Bridge-GUI's Exception::what().
 * GODT-2427: Parsing header issues.
 * GODT-2426: Fix crash on user delete.
@ -727,7 +358,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-2404: Handle unexpected EOF.
 * GODT-2400: Allow state updates to be applied if command fails.
 * GODT-2399: Fix immediate message deletion during updates.
-* GODT-2390: Missing changes from previous commit.
+* GODT-2390: Missing changes from pervious commit.
 * GODT-2390: Add reports for uncaught json and net.opErr.
 * GODT-2414: Multiple deletion bug in WriteControlledStore.
@ -792,7 +423,7 @@ GODT-1804: Preserve MIME parameters when uploading attachments.
 * GODT-2223: Improve event handling.
 * GODT-2305: Detect missing gluon DB.
 * GODT-2291: Change gluon store default location from Cache to Data.
-* Other: Disable dialer test until badssl cert is bumped.
+* Other: Disable dialer test until badssl cert is bumbed.
 * GODT-2292: Updated BUILDS.md doc.
 * GODT-2258: suggest email as login when signing in via status window.
 * Other: Report corrupt and/or insecure vaults to sentry.
@ -1072,7 +703,7 @@ GODT-1804: Preserve MIME parameters when uploading attachments.
 ## [Bridge 2.4.6] Osney
 ### Changed
-* GODT-2019: When signing out and a single user is connected we do not go back to the welcome screen.
+* GODT-2019: When signing out and a single user is connecte* we do not go back to the welcome screen.
 * GODT-2071: Bridge-gui report error if an orphan bridge is detected.
 * GODT-2046: Bridge-gui log is included in optional archive sent with bug reports.
 * GODT-2039: Bridge monitors bridge-gui via its PID.
@ -1226,7 +857,7 @@ GODT-1804: Preserve MIME parameters when uploading attachments.
    * GODT-1260: Renaming.
    * GODT-1502: Rebranding: color and radius.
 * GODT-1549: Add notification when address list changes.
-* GODT-1560: Dependency licenses update and link.
+* GODT-1560: Dependecy licenses update and link.
 ### Changed
 * GODT-1543: Using one buffered event for off and on connection.
@ -1323,7 +954,7 @@ GODT-1537: Manual in-app update mechanism.
    * GODT-1338: GODT-1343 Help view buttons.
    * GODT-1340: Not crashing, user list updating in main thread.
    * GODT-1345: Adding panic handlers.
-    * GODT-1271: Fix Status margins.
+    * GODT-1271: Fix Status margings.
    * GODT-1320: Add loading property to each action within a notification.
    * GODT-1210: Add "free user" banner.
    * GODT-1314: Limit description field length within 150/800 bounds.
@ -1365,7 +996,7 @@ GODT-1537: Manual in-app update mechanism.
    * GODT-1381 Treat readonly folder as failure for cache on disk.
    * GODT-1431 Prevent watcher when not using disk on cache.
    * GODT-1381: Use in-memory cache in case local cache is unavailable.
-    * GODT-1356 GODT-1302: Cache on disk concurrency and API retries.
+    * GODT-1356 GODT-1302: Cache on disk concurency and API retries.
    * GODT-1332 Added tests for cache move functions.
    * GODT-1332: moved cache related functions to separate file.
    * GODT-1332 moving cache does not work on Windows.
@ -1616,7 +1247,7 @@ GODT-1537: Manual in-app update mechanism.
 ### 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 changing channel right away only in case of downgrade.
+* 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.
@ -1706,7 +1337,7 @@ GODT-1537: Manual in-app update mechanism.
 * GODT-820 Added GUI notification on impossibility of update installation (both silent and manual).
 * GODT-870 Added GUI notification on error during silent update.
 * GODT-805 Added GUI notification on update available.
-* GODT-804 Added GUI notification on silent update installed (prompt to restart).
+* GODT-804 Added GUI notification on silent update installed (promt to restart).
 * GODT-275 Added option to disable autoupdates in settings (default autoupdate is enabled).
 * GODT-874 Added manual triggers to Updater module.
 * GODT-851 Added support of UID EXPUNGE.
@ -2030,7 +1661,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 ### Changed
 * GODT-360 Detect charset embedded in html/xml.
-* GODT-354 Do not label/unlabel messages from `All Mail` folder.
+* GODT-354 Do not label/unlabel messsages from `All Mail` folder.
 * GODT-388 Support for both bridge and import/export credentials by package users.
 * GODT-387 Store factory to make store optional.
 * GODT-386 Renamed bridge to general users and keep bridge only for bridge stuff.
@ -2195,13 +1826,13 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * GODT-88 Run mbox sync in parallel when switch password mode (re-init not user).
 * GODT-95 Do not throw error when trying to create new mailbox in IMAP root.
 * GODT-75 Do not fail on unlabel inside delete.
-* #1095 always delete IMAP USER including wrong password.
+* #1095 always delete IMAP USER including wrong pasword.
 * Unique pmapi client userID (including #1098).
 * Using go.enmime@v0.6.1 snapshot.
 * Better detection of non-auth-error.
 * Reset `hasAuthChannel` during logout for proper login functionality (set up auth channel and unlock keys).
 * Allow `APPEND` messages without parsable email address in sender field.
-* #1060 avoid `Append` after internal message ID was found and message was copied to mailbox using `MessageLabel`.
+* #1060 avoid `Append` after internal message ID was found and message was copyed to mailbox using `MessageLabel`.
 * #1049 Basic usage of store in SMTP package to poll event loop during sending message.
 * #1050 pollNow waits for events to be processed.
 * #1047 Fix fetch of empty mailbox.
@ -2327,7 +1958,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * #903 added http.Client timeout to not hang out forever.
 * Closing body after checking internet connection.
 * Pedantic lint for bridgeUtils.
-* Selected events are buffered and emitted again when frontend loop is ready.
+* Selected events are buffered and emited again when frontend loop is ready.
 * #890 implemented 2FA endpoint (auth split).
 * #888 TLS Cert.
    * Error bar and modal with explanation in GUI.
@ -2335,7 +1966,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
    * Add pinning to bridge (only for live API builds).
 * #887 #883:
 * Wait before clearing data.
- * Configure which provides pmapi.ClientConfig and app directories.
+ * Configer which provides pmapi.ClientConfig and app directories.
 * #861 restart after clear data.
 * Panic handler for all goroutines.
 * CD for linux.
@ -2383,7 +2014,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * #882 unassign PMAPI client after logout and force to run garbage collector.
 * #880, #884, #885, #886 fix of informing user about outgoing non-encrypted e-mail.
 * #838 `Sirupsen` -> `sirupsen`.
-* #893 save panic report file every time.
+* #893 save panic report file everytime.
 * #880 fix of informing user about outgoing non-encrypted e-mail.
 * Fix aliases in split mode.
 * Fix decrypted data in log notification.
@ -2457,7 +2088,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 ### Changed
 * Fix custom message format.
-* #802 accumulated long lines while parsing body structure.
+* #802 acumulated long lines while parsing body structure.
 * Process `AddressEvent` before `MessageEvent`.
 * #791 updated crypto: fix wrong signature format.
 * #793 fix returning size.
@ -2479,7 +2110,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 ### Changed
 * #748 when charset missing assume utf8 and check the validity.
-* #750 before sync check that events are up-to-date, if not poll events instead of sync.
+* #750 before sync check that events are uptodate, if not poll events instead of sync.
 * Use pmapi with support of decrypted access token.
 * #750 Status is using DB status instead of API.
 * Format panic error as string instead of struct dump.
@ -2496,7 +2127,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * Full version of program visible on release notes.
 ### Changed
-* #720 only one concurrent DB sync.
+* #720 only one concurent DB sync.
 * #720 sync every 3 pages.
 * #512 extending list of charsets go-pm-mime!4.
@ -2520,7 +2151,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * Fix srp modulus issue with new `ProtonMail/crypto`.
 * Generate version files from main file.
 * Be able to set update set on build.
-* #597 check on start that certificate will be still valid after one month and generate new cert if not.
+* #597 check on start that certificat will be still valid after one month and generate new cert if not.
 * #597 extended certificate validity to 2 years.
 * Copyright 2019.
 * Exclude `protontech` repos from credits.
@ -2539,7 +2170,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * #592 internal references are added only when not present already.
 * #592 field `Date` changed to m.Time only when wrong format or missing `Date`.
 * #645 pmapi#26 `Message.Flags` instead of `IsEncrypted`, `Type`, `IsReplied`, `IsRepliedAll`, `IsForwarded`.
-* DB: do not allow to put Body or Attachments to db.
+* DB: do not allow to put Body or Attachements to db.
 * #574 SMTP: can now send more than one email.
 * #671 Verbosity levels: `debug` (only bridge), `debug-client` (bridge and client communication), `debug-server` (bridge, whole SMTP/IMAP communication).
 * #644 Return rfc.size 0 or correct size of fetched body (stored in DB).
@ -2611,7 +2242,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * Start with new versioning.
          1.1.0
-          | | `--- bug fix number (internal, irregular, beta releases)
+          | | `--- bug fix number (internal, irregular, beta relases)
          | `----- minor version (features, release once per month, live release, milestones)
          `------- major version (big changes, once per year, breaking changes, api force upgrade)
@ -2677,7 +2308,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * All `client.Do` errors are interpreted as connection issue.
 * Moved to internal gitlab.
 * Typo `frontend-qml`.
-* Better message for case when server is not reachable.
+* Better message for case when server is not reacheable.
 * Setting 1min timeout to IMAP connection.
 ### Changed
@ -2709,12 +2340,12 @@ CSB-331 Fix sending error due to mixed case in sender address.
 * Keychain format and function refactor.
 * Create crash file on panic with full trace.
 * Clear old data only in main process (no double keychain typing).
-* Create label update API route.
+* Create label udpate API route.
 * Selectable text in release notes.
 ### Added
 * Support sending to external PGP recipients.
-* Return error codes: `0: Ok`, `2: Frontend crashed`, `3: Bridge already running`, `4: Unknown argument`, `42: Restart application`.
+* Return error codes: `0: Ok`, `2: Frontend crashed`, `3: Bridge already running`, `4: Uknown argument`, `42: Restart application`.
 ### Release notes
 * Support of encryption to external PGP recipients using contacts created on beta.protonmail.com (see https://protonmail.com/blog/pgp-vulnerability-efail/ to understand the vulnerabilities that may be associated with sending to other PGP clients).
@ -2739,7 +2370,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
    * Bug report window.
    * Checkbox and with label (only I/E).
    * Error dialog and Info tooltip (only I/E).
-    * Add user modal formatting (colors, text).
+    * Add user modal formating (colors, text).
    * Account view style.
    * Input box style (used in bug report).
    * Input field style (used in add account and change port).
--- a/67
+++ b/67
@ -1,18 +1,17 @@
 export GO111MODULE=on
 export CGO_ENABLED=1
 # By default, the target OS is the same as the host OS,
 # but this can be overridden by setting TARGET_OS to "windows"/"darwin"/"linux".
 GOOS:=$(shell go env GOOS)
 TARGET_CMD?=Desktop-Bridge
 TARGET_OS?=${GOOS}
-ROOT_DIR:=$(realpath .)
+ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 ## Build
 .PHONY: build build-gui build-nogui build-launcher versioner hasher
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=3.12.0+git
+BRIDGE_APP_VERSION?=3.4.2+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG
@ -20,8 +19,8 @@ SRC_ICO:=bridge.ico
 SRC_ICNS:=Bridge.icns
 SRC_SVG:=bridge.svg
 EXE_NAME:=proton-bridge
-REVISION:=$(shell "${ROOT_DIR}/utils/get_revision.sh" rev)
+REVISION:=$(shell ./utils/get_revision.sh)
-TAG:=$(shell "${ROOT_DIR}/utils/get_revision.sh" tag)
+TAG:=$(shell ./utils/get_revision.sh tag)
 BUILD_TIME:=$(shell date +%FT%T%z)
 MACOS_MIN_VERSION_ARM64=11.0
 MACOS_MIN_VERSION_AMD64=10.15
@ -102,9 +101,9 @@ endif
 ifeq "${GOOS}" "windows"
 	go-build-finalize= \
-		$(if $(4),cp "${ROOT_DIR}/${RESOURCE_FILE}" ${4}  &&,) \
+		$(if $(4),powershell Copy-Item ${ROOT_DIR}/${RESOURCE_FILE} ${4}  &&,) \
 		$(call go-build,$(1),$(2),$(3)) \
-		$(if $(4), && rm -f ${4},)
+		$(if $(4), && powershell Remove-Item ${4} -Force,)
 endif
 ${EXE_NAME}: gofiles  ${RESOURCE_FILE}
@ -118,10 +117,7 @@ versioner:
 	go build ${BUILD_FLAGS} -o versioner utils/versioner/main.go
 vault-editor:
-	$(call go-build-finalize,-tags=debug,"vault-editor","./utils/vault-editor/main.go")
+	$(call go-build-finalize,"-tags=debug","vault-editor","./utils/vault-editor/main.go")
 bridge-rollout:
 	$(call go-build-finalize,, "bridge-rollout","./utils/bridge-rollout/bridge-rollout.go")
 hasher:
 	go build -o hasher utils/hasher/main.go
@ -168,7 +164,7 @@ ${EXE_TARGET}: check-build-essentials ${EXE_NAME}
 		BRIDGE_BUILD_TIME=${BUILD_TIME} \
 		BRIDGE_GUI_BUILD_CONFIG=Release \
 		BRIDGE_BUILD_ENV=${BUILD_ENV} \
-		BRIDGE_INSTALL_PATH="${ROOT_DIR}/${DEPLOY_DIR}/${GOOS}" \
+		BRIDGE_INSTALL_PATH=${ROOT_DIR}/${DEPLOY_DIR}/${GOOS} \
 		./build.sh install
 	mv "${ROOT_DIR}/${BRIDGE_EXE}" "$(ROOT_DIR)/${EXE_TARGET}"
@ -189,7 +185,7 @@ ${RESOURCE_FILE}: ./dist/info.rc ./dist/${SRC_ICO} .FORCE
 ## Dev dependencies
 .PHONY: install-devel-tools install-linter install-go-mod-outdated install-git-hooks
-LINTVER:="v1.55.2"
+LINTVER:="v1.52.2"
 LINTSRC:="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh"
 install-dev-dependencies: install-devel-tools install-linter install-go-mod-outdated
@ -250,7 +246,7 @@ test-race: gofiles
 test-integration: gofiles
 	mkdir -p coverage/integration
 	go test \
-		-v -timeout=60m -p=1 -count=1 -tags=test_integration \
+		-v -timeout=60m -p=1 -count=1 \
 		${GOCOVERAGE} \
 		github.com/ProtonMail/proton-bridge/v3/tests \
 		${GOCOVERDIR}/integration
@ -262,22 +258,6 @@ test-integration-debug: gofiles
 test-integration-race: gofiles
 	go test -v -timeout=60m -p=1 -count=1 -race -failfast github.com/ProtonMail/proton-bridge/v3/tests
 test-integration-nightly: gofiles
 	mkdir -p coverage/integration
 	go test \
 		-v -timeout=90m -p=1 -count=1 -tags=test_integration \
 		${GOCOVERAGE} \
 		github.com/ProtonMail/proton-bridge/v3/tests \
 		${GOCOVERDIR}/integration \
 		nightly
 fuzz: gofiles
 	go test -fuzz=FuzzUnmarshal 	 -parallel=4 -fuzztime=60s $(PWD)/internal/legacy/credentials
 	go test -fuzz=FuzzNewParser 	 -parallel=4 -fuzztime=60s $(PWD)/pkg/message/parser
 	go test -fuzz=FuzzReadHeaderBody -parallel=4 -fuzztime=60s $(PWD)/pkg/message
 	go test -fuzz=FuzzDecodeHeader 	 -parallel=4 -fuzztime=60s $(PWD)/pkg/mime
 	go test -fuzz=FuzzDecodeCharset  -parallel=4 -fuzztime=60s $(PWD)/pkg/mime
 bench:
 	go test -run '^$$' -bench=. -memprofile bench_mem.pprof -cpuprofile bench_cpu.pprof ./internal/store
 	go tool pprof -png -output bench_mem.png bench_mem.pprof
@ -294,23 +274,9 @@ mocks:
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/updater Downloader,Installer > internal/updater/mocks/mocks.go
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/telemetry HeartbeatManager > internal/telemetry/mocks/mocks.go
 	cp internal/telemetry/mocks/mocks.go internal/bridge/mocks/telemetry_mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/services/userevents \
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/user MessageDownloader > internal/user/mocks/mocks.go
 EventSource,EventIDStore  > internal/services/userevents/mocks/mocks.go
 	mockgen --package userevents github.com/ProtonMail/proton-bridge/v3/internal/services/userevents \
 EventSubscriber,MessageEventHandler,LabelEventHandler,AddressEventHandler,RefreshEventHandler,UserEventHandler,UserUsedSpaceEventHandler > tmp
 	mv tmp internal/services/userevents/mocks_test.go
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/events EventPublisher \
 > internal/events/mocks/mocks.go
 	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/services/useridentity IdentityProvider,Telemetry \
 > internal/services/useridentity/mocks/mocks.go
 	mockgen --self_package "github.com/ProtonMail/proton-bridge/v3/internal/services/syncservice" -package syncservice github.com/ProtonMail/proton-bridge/v3/internal/services/syncservice \
 ApplyStageInput,BuildStageInput,BuildStageOutput,DownloadStageInput,DownloadStageOutput,MetadataStageInput,MetadataStageOutput,\
 StateProvider,Regulator,UpdateApplier,MessageBuilder,APIClient,Reporter,DownloadRateModifier \
 > tmp
 	mv tmp internal/services/syncservice/mocks_test.go
 	mockgen --package mocks github.com/ProtonMail/gluon/connector IMAPStateWrite > internal/services/imapservice/mocks/mocks.go
-lint: gofiles lint-golang lint-license lint-dependencies lint-changelog lint-bug-report
+lint: gofiles lint-golang lint-license lint-dependencies lint-changelog
 lint-license:
 	./utils/missing_license.sh check
@ -326,11 +292,12 @@ lint-golang:
 	$(info linting with GOMAXPROCS=${GOMAXPROCS})
 	golangci-lint run ./...
-lint-bug-report:
+gobinsec: gobinsec-cache.yml build
-	python3 utils/validate_bug_report_file.py --file "internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json"
+	gobinsec -wait -cache -config utils/gobinsec_conf.yml ${EXE_TARGET} ${DEPLOY_DIR}/${TARGET_OS}/${LAUNCHER_EXE}
-lint-bug-report-preview:
+gobinsec-cache.yml:
-	python3 utils/validate_bug_report_file.py --file "internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json" --preview
+	./utils/gobinsec_update.sh
 	cp ./utils/gobinsec_update/gobinsec-cache-valid.yml ./gobinsec-cache.yml
 updates: install-go-mod-outdated
 	# Uncomment the "-ci" to fail the job if something can be updated.
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 # Proton Mail Bridge and Import Export app
-Copyright (c) 2024 Proton AG
+Copyright (c) 2023 Proton AG
 This repository holds the Proton Mail Bridge and the Proton Mail Import-Export applications.
 For a detailed build information see [BUILDS](./BUILDS.md).
--- a/ci/build.yml
+++ b/ci/build.yml
@ -1,72 +0,0 @@
 ---
 .script-build:
  stage: build
  needs: ["lint"]
  extends:
    - .rules-branch-and-MR-manual
  script:
    - which go && go version
    - which gcc && gcc --version
    - which qmake && qmake --version
    - git rev-parse --short=10 HEAD
    - make build
    - git diff && git diff-index --quiet HEAD
    - make vault-editor
    - make bridge-rollout
  artifacts:
    expire_in: 1 day
    when: always
    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
    paths:
      - bridge_*.tgz
      - vault-editor
      - bridge-rollout
 build-linux:
  extends:
    - .script-build
    - .env-linux-build
 build-linux-qa:
  extends:
    - build-linux
    - .rules-branch-manual-MR-and-devel-always
  variables:
    BUILD_TAGS: "build_qa"
 build-darwin:
  extends:
    - .script-build
    - .env-darwin
 build-darwin-qa:
  extends:
    - build-darwin
  variables:
    BUILD_TAGS: "build_qa"
 build-windows:
  extends:
    - .script-build
    - .env-windows
 build-windows-qa:
  extends:
    - build-windows
  variables:
    BUILD_TAGS: "build_qa"
 trigger-qa-installer:
  stage: build
  needs: ["lint"]
  extends:
    - .rules-br-tag-always-branch-and-MR-manual
  variables:
    APP: bridge
    WORKFLOW: build-all
    SRC_TAG: $CI_COMMIT_BRANCH
    TAG: $CI_COMMIT_TAG
    SRC_HASH: $CI_COMMIT_SHA
  trigger:
    project: "jcuth/bridge-release"
    branch: master
--- a/ci/env.yml
+++ b/ci/env.yml
@ -1,59 +0,0 @@
 ---
 .env-windows:
  extends:
    - .image-windows-virt-build
  before_script:
    - !reference [.before-script-windows-virt-build, before_script]
    - !reference [.before-script-git-config, before_script]
    - mkdir -p .cache/bin
    - export PATH=$(pwd)/.cache/bin:$PATH
    - export GOPATH="$CI_PROJECT_DIR/.cache"
  variables:
    GOARCH: amd64
    BRIDGE_SYNC_FORCE_MINIMUM_SPEC: 1
    VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
  cache:
    key: windows-vcpkg-go-0
    paths:
      - .cache
    when: 'always'
 .env-darwin:
  extends:
    - .image-darwin-build
  before_script:
    - !reference [.before-script-darwin-tart-build, before_script]
    - !reference [.before-script-git-config, before_script]
    - mkdir -p .cache/bin
    - export PATH=$(pwd)/.cache/bin:$PATH
    - export GOPATH="$CI_PROJECT_DIR/.cache"
  variables:
    BRIDGE_SYNC_FORCE_MINIMUM_SPEC: 1
    VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
  cache:
    key: darwin-go-and-vcpkg
    paths:
      - .cache
    when: 'always'
 .env-linux-build:
  extends:
    - .image-linux-build
  variables:
    VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
  cache:
    key: linux-vcpkg
    paths:
      - .cache
    when: 'always'
  before_script:
    - export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
    - !reference [.before-script-git-config, before_script]
    - mkdir -p .cache/bin
    - export PATH=$(pwd)/.cache/bin:$PATH
    - export GOPATH="$CI_PROJECT_DIR/.cache"
  tags:
    - shared-large
--- a/ci/rules.yml
+++ b/ci/rules.yml
@ -1,58 +0,0 @@
 ---
 .rules-branch-and-MR-manual:
  rules:
    - if: $CI_COMMIT_BRANCH ||  $CI_PIPELINE_SOURCE == "merge_request_event"
      when: manual
      allow_failure: true
    - when: never
 .rules-branch-manual-MR-and-devel-always:
  rules:
    - if: $CI_COMMIT_BRANCH == "devel" || $CI_PIPELINE_SOURCE == "merge_request_event"
      when: always
      allow_failure: false
    - if: $CI_COMMIT_BRANCH
      when: manual
      allow_failure: true
    - when: never
 .rules-branch-manual-br-tag-and-MR-and-devel-always:
  rules:
    - if: $CI_COMMIT_BRANCH == "devel" || $CI_PIPELINE_SOURCE == "merge_request_event"
      when: always
      allow_failure: false
    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^br-\d+/
      when: always
      allow_failure: false
    - if: $CI_COMMIT_BRANCH
      when: manual
      allow_failure: true
    - when: never
 .rules-branch-manual-scheduled-and-test-branch-always:
  rules:
    - if: $CI_PIPELINE_SOURCE == "schedule"
      when: always
      allow_failure: false
    - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME=~ /^test/
      when: always
      allow_failure: false
    - if: $CI_COMMIT_BRANCH
      when: manual
      allow_failure: true
    - when: never
 .rules-br-tag-always-branch-and-MR-manual:
  rules:
    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH
      when: manual
      allow_failure: true
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
      when: manual
      allow_failure: true
    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^br-\d+/
      when: always
    - when: never
--- a/ci/setup.yml
+++ b/ci/setup.yml
@ -1,7 +0,0 @@
 ---
 include:
  - project: 'go/bridge-internal'
    ref: 'master'
    file: 'ci/runners-setup.yml'
--- a/ci/test.yml
+++ b/ci/test.yml
@ -1,152 +0,0 @@
 ---
 lint:
  stage: test
  extends:
    - .image-linux-test
    - .rules-branch-manual-br-tag-and-MR-and-devel-always
  script:
    - make lint
  tags:
    - shared-medium
 lint-bug-report-preview:
  stage: test
  extends:
    - .image-linux-test
    - .rules-branch-and-MR-manual
  script:
    - make lint-bug-report-preview
  tags:
    - shared-medium
 .script-test:
  stage: test
  extends:
    - .rules-branch-manual-MR-and-devel-always
  script:
    - which go && go version
    - which gcc && gcc --version
    - make test
  artifacts:
    paths:
      - coverage/**
 test-linux:
  extends:
    - .image-linux-test
    - .script-test
  tags:
    - shared-large
 test-windows:
  extends:
    - .env-windows
    - .script-test
 test-darwin:
  extends:
    - .env-darwin
    - .script-test
 fuzz-linux:
  stage: test
  extends:
    - .image-linux-test
    - .rules-branch-manual-MR-and-devel-always
  script:
    - make fuzz
  tags:
    - shared-large
 test-linux-race:
  extends:
    - test-linux
    - .rules-branch-and-MR-manual
  script:
    - make test-race
 test-integration:
  extends:
    - test-linux
  script:
    - make test-integration | tee -a integration-job.log
  after_script:
    - |
      grep "Error: " integration-job.log
  artifacts:
    when: always
    paths:
      - integration-job.log
 test-integration-race:
  extends:
    - test-integration
    - .rules-branch-and-MR-manual
  script:
    - make test-integration-race | tee -a integration-race-job.log
  artifacts:
    when: always
    paths:
      - integration-race-job.log
 test-integration-nightly:
  extends:
    - test-integration
    - .rules-branch-manual-scheduled-and-test-branch-always
  needs:
    - test-integration
  script:
    - make test-integration-nightly | tee -a nightly-job.log
  after_script:
    - |
      grep "Error: " nightly-job.log
  artifacts:
    when: always
    paths:
      - nightly-job.log
 test-coverage:
  stage: test
  extends:
    - .image-linux-test
    - .rules-branch-manual-scheduled-and-test-branch-always
  script:
    - ./utils/coverage.sh
  coverage: '/total:.*\(statements\).*\d+\.\d+%/'
  needs:
    - test-linux
    - test-windows
    - test-darwin
    - test-integration
    - test-integration-nightly
  tags:
    - shared-small
  artifacts:
    paths:
      - coverage*
      - coverage/**
    when: 'always'
    reports:
      coverage_report:
        coverage_format: cobertura
        path: coverage.xml
 go-vuln-check:
  extends:
    - .image-linux-test
    - .rules-branch-manual-MR-and-devel-always
  stage: test
  tags:
    - shared-medium
  script:
    - ./utils/govulncheck.sh
  artifacts:
    when: always
    paths:
      - vulns*
--- a/cmd/Desktop-Bridge/main.go
+++ b/cmd/Desktop-Bridge/main.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -19,17 +19,11 @@ package main
 import (
 	"os"
 	"runtime"
 	"strings"
 	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
 	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
 	"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
 	"github.com/sirupsen/logrus"
 	"github.com/ProtonMail/proton-bridge/v3/internal/app"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/sirupsen/logrus"
 )
 /*
@ -50,72 +44,7 @@ import (
 */
 func main() {
-	appErr := app.New().Run(xslices.Filter(os.Args, func(arg string) bool { return !strings.Contains(arg, "-psn_") }))
+	if err := app.New().Run(xslices.Filter(os.Args, func(arg string) bool { return !strings.Contains(arg, "-psn_") })); err != nil {
-	if appErr != nil {
+		logrus.Fatal(err)
 		_ = app.WithLocations(func(l *locations.Locations) error {
 			logsPath, err := l.ProvideLogsPath()
 			if err != nil {
 				return err
 			}
 			// Get the session ID if its specified
 			var sessionID logging.SessionID
 			if flagVal, found := getFlagValue(os.Args, app.FlagSessionID); found {
 				sessionID = logging.SessionID(flagVal)
 			} else {
 				sessionID = logging.NewSessionID()
 			}
 			closer, err := logging.Init(
 				logsPath,
 				sessionID,
 				logging.BridgeShortAppName,
 				logging.DefaultMaxLogFileSize,
 				logging.DefaultPruningSize,
 				"",
 			)
 			if err != nil {
 				return err
 			}
 			defer func() {
 				_ = logging.Close(closer)
 			}()
 			logrus.
 				WithField("appName", constants.FullAppName).
 				WithField("version", constants.Version).
 				WithField("revision", constants.Revision).
 				WithField("tag", constants.Tag).
 				WithField("build", constants.BuildTime).
 				WithField("runtime", runtime.GOOS).
 				WithField("args", os.Args).
 				WithField("SentryID", sentry.GetProtectedHostname()).WithError(appErr).Error("Failed to initialize bridge")
 			return nil
 		})
 	}
 }
 // getFlagValue - obtains the value of a specified tag
 // The flag can be of the following form `-flag value`, `--flag value`, `-flag=value` or `--flags=value`.
 func getFlagValue(argList []string, flag string) (string, bool) {
 	eqPrefix1 := "-" + flag + "="
 	eqPrefix2 := "--" + flag + "="
 	for i := 0; i < len(argList); i++ {
 		arg := argList[i]
 		if strings.HasPrefix(arg, eqPrefix1) {
 			val := strings.TrimPrefix(arg, eqPrefix1)
 			return val, len(val) > 0
 		}
 		if strings.HasPrefix(arg, eqPrefix2) {
 			val := strings.TrimPrefix(arg, eqPrefix2)
 			return val, len(val) > 0
 		}
 		if (arg == "-"+flag || arg == "--"+flag) && i+1 < len(argList) {
 			return argList[i+1], true
 		}
 	}
 	return "", false
 }
--- a/cmd/Desktop-Bridge/main_test.go
+++ b/cmd/Desktop-Bridge/main_test.go
@ -1,47 +0,0 @@
 // Copyright (c) 2024 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
 // Proton Mail 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.
 //
 // Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 package main
 import (
 	"testing"
 	"github.com/stretchr/testify/require"
 )
 func TestGetFlagValue(t *testing.T) {
 	tests := []struct {
 		args     []string
 		flag     string
 		expected string
 	}{
 		{[]string{"session-id", ""}, "session-id", ""},
 		{[]string{"-session-id", ""}, "session-id", ""},
 		{[]string{"--session-id", ""}, "session-id", ""},
 		{[]string{"session-id", "test"}, "session-id", ""},
 		{[]string{"-session-id", "test"}, "session-id", "test"},
 		{[]string{"--session-id", "test"}, "session-id", "test"},
 		{[]string{"session-id=test"}, "session-id", ""},
 		{[]string{"-session-id=test"}, "session-id", "test"},
 		{[]string{"--session-id=test"}, "session-id", "test"},
 	}
 	for _, tt := range tests {
 		val, _ := getFlagValue(tt.args, tt.flag)
 		require.Equal(t, val, tt.expected)
 	}
 }
--- a/cmd/launcher/main.go
+++ b/cmd/launcher/main.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -40,7 +40,6 @@ import (
 	"github.com/elastic/go-sysinfo/types"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/exp/slices"
 	"golang.org/x/sys/execabs"
 )
@ -54,12 +53,9 @@ const (
 	FlagCLIShort            = "c"
 	FlagNonInteractive      = "noninteractive"
 	FlagNonInteractiveShort = "n"
-	FlagLauncher            = "launcher"
+	FlagLauncher            = "--launcher"
-	FlagWait                = "wait"
+	FlagWait                = "--wait"
-	FlagSessionID           = "session-id"
+	FlagSessionID           = "--session-id"
 	HyphenatedFlagLauncher  = "--" + FlagLauncher
 	HyphenatedFlagWait      = "--" + FlagWait
 	HyphenatedFlagSessionID = "--" + FlagSessionID
 )
 func main() { //nolint:funlen
@ -155,7 +151,7 @@ func main() { //nolint:funlen
 		}
 	}
-	cmd := execabs.Command(exe, appendLauncherPath(launcher, appendOrModifySessionID(args, string(sessionID)))...) //nolint:gosec
+	cmd := execabs.Command(exe, appendLauncherPath(launcher, append(args, FlagSessionID, string(sessionID)))...) //nolint:gosec
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
@ -177,14 +173,19 @@ func main() { //nolint:funlen
 // appendLauncherPath add launcher path if missing.
 func appendLauncherPath(path string, args []string) []string {
-	if !slices.Contains(args, HyphenatedFlagLauncher) {
+	if !sliceContains(args, FlagLauncher) {
 		res := append([]string{}, args...)
-		res = append(res, HyphenatedFlagLauncher, path)
+		res = append(res, FlagLauncher, path)
 		return res
 	}
 	return args
 }
 // sliceContains checks if a value is present in a list.
 func sliceContains[T comparable](list []T, s T) bool {
 	return xslices.Any(list, func(arg T) bool { return arg == s })
 }
 // inCLIMode detect if CLI mode is asked.
 func inCLIMode(args []string) bool {
 	return hasFlag(args, FlagCLI) || hasFlag(args, FlagCLIShort) || hasFlag(args, FlagNonInteractive) || hasFlag(args, FlagNonInteractiveShort)
@ -192,12 +193,7 @@ func inCLIMode(args []string) bool {
 // hasFlag checks if a flag is present in a list.
 func hasFlag(args []string, flag string) bool {
-	return flagIndex(args, flag) >= 0
+	return xslices.Any(args, func(arg string) bool { return (arg == "-"+flag) || (arg == "--"+flag) })
 }
 // flagIndex returns the position of the first occurrence of a flag int args, or -1 if the flag is not present.
 func flagIndex(args []string, flag string) int {
 	return slices.IndexFunc(args, func(arg string) bool { return (arg == "-"+flag) || (arg == "--"+flag) })
 }
 // findAndStrip check if a value is present in s list and remove all occurrences of the value from this list.
@ -215,7 +211,7 @@ func findAndStripWait(args []string) ([]string, bool, []string) {
 	hasFlag := false
 	values := make([]string, 0)
 	for k, v := range res {
-		if v != HyphenatedFlagWait {
+		if v != FlagWait {
 			continue
 		}
 		if k+1 >= len(res) {
@ -226,7 +222,7 @@ func findAndStripWait(args []string) ([]string, bool, []string) {
 	}
 	if hasFlag {
-		res, _ = findAndStrip(res, HyphenatedFlagWait)
+		res, _ = findAndStrip(res, FlagWait)
 		for _, v := range values {
 			res, _ = findAndStrip(res, v)
 		}
@ -234,23 +230,6 @@ func findAndStripWait(args []string) ([]string, bool, []string) {
 	return res, hasFlag, values
 }
 // return args with the sessionID flag and value added or modified. The original slice is not modified.
 func appendOrModifySessionID(args []string, sessionID string) []string {
 	index := flagIndex(args, FlagSessionID)
 	if index < 0 {
 		return append(args, HyphenatedFlagSessionID, sessionID)
 	}
 	if index == len(args)-1 {
 		return append(args, sessionID)
 	}
 	res := slices.Clone(args)
 	res[index+1] = sessionID
 	return res
 }
 func getPathToUpdatedExecutable(
 	name string,
 	ver *versioner.Versioner,
--- a/cmd/launcher/main_test.go
+++ b/cmd/launcher/main_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -20,62 +20,61 @@ package main
 import (
 	"testing"
-	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/bradenaw/juniper/xslices"
 	"github.com/stretchr/testify/assert"
 )
 func TestSliceContains(t *testing.T) {
 	assert.True(t, sliceContains([]string{"a", "b", "c"}, "a"))
 	assert.True(t, sliceContains([]int{1, 2, 3}, 2))
 	assert.False(t, sliceContains([]string{"a", "b", "c"}, "A"))
 	assert.False(t, sliceContains([]int{1, 2, 3}, 4))
 	assert.False(t, sliceContains([]string{}, "a"))
 	assert.True(t, sliceContains([]string{"a", "a"}, "a"))
 }
 func TestFindAndStrip(t *testing.T) {
 	list := []string{"a", "b", "c", "c", "b", "c"}
 	result, found := findAndStrip(list, "a")
 	assert.True(t, found)
-	assert.Equal(t, result, []string{"b", "c", "c", "b", "c"})
+	assert.True(t, xslices.Equal(result, []string{"b", "c", "c", "b", "c"}))
 	result, found = findAndStrip(list, "c")
 	assert.True(t, found)
-	assert.Equal(t, result, []string{"a", "b", "b"})
+	assert.True(t, xslices.Equal(result, []string{"a", "b", "b"}))
 	result, found = findAndStrip([]string{"c", "c", "c"}, "c")
 	assert.True(t, found)
-	assert.Equal(t, result, []string{})
+	assert.True(t, xslices.Equal(result, []string{}))
 	result, found = findAndStrip(list, "A")
 	assert.False(t, found)
-	assert.Equal(t, result, list)
+	assert.True(t, xslices.Equal(result, list))
 	result, found = findAndStrip([]string{}, "a")
 	assert.False(t, found)
-	assert.Equal(t, result, []string{})
+	assert.True(t, xslices.Equal(result, []string{}))
 }
 func TestFindAndStripWait(t *testing.T) {
 	result, found, values := findAndStripWait([]string{"a", "b", "c"})
 	assert.False(t, found)
-	assert.Equal(t, result, []string{"a", "b", "c"})
+	assert.True(t, xslices.Equal(result, []string{"a", "b", "c"}))
-	assert.Equal(t, values, []string{})
+	assert.True(t, xslices.Equal(values, []string{}))
 	result, found, values = findAndStripWait([]string{"a", "--wait", "b"})
 	assert.True(t, found)
-	assert.Equal(t, result, []string{"a"})
+	assert.True(t, xslices.Equal(result, []string{"a"}))
-	assert.Equal(t, values, []string{"b"})
+	assert.True(t, xslices.Equal(values, []string{"b"}))
 	result, found, values = findAndStripWait([]string{"a", "--wait", "b", "--wait", "c"})
 	assert.True(t, found)
-	assert.Equal(t, result, []string{"a"})
+	assert.True(t, xslices.Equal(result, []string{"a"}))
-	assert.Equal(t, values, []string{"b", "c"})
+	assert.True(t, xslices.Equal(values, []string{"b", "c"}))
 	result, found, values = findAndStripWait([]string{"a", "--wait", "b", "--wait", "c", "--wait", "d"})
 	assert.True(t, found)
-	assert.Equal(t, result, []string{"a"})
+	assert.True(t, xslices.Equal(result, []string{"a"}))
-	assert.Equal(t, values, []string{"b", "c", "d"})
+	assert.True(t, xslices.Equal(values, []string{"b", "c", "d"}))
 }
 func TestAppendOrModifySessionID(t *testing.T) {
 	sessionID := string(logging.NewSessionID())
 	assert.Equal(t, appendOrModifySessionID(nil, sessionID), []string{"--session-id", sessionID})
 	assert.Equal(t, appendOrModifySessionID([]string{}, sessionID), []string{"--session-id", sessionID})
 	assert.Equal(t, appendOrModifySessionID([]string{"--cli"}, sessionID), []string{"--cli", "--session-id", sessionID})
 	assert.Equal(t, appendOrModifySessionID([]string{"--cli", "--session-id"}, sessionID), []string{"--cli", "--session-id", sessionID})
 	assert.Equal(t, appendOrModifySessionID([]string{"--cli", "--session-id"}, sessionID), []string{"--cli", "--session-id", sessionID})
 	assert.Equal(t, appendOrModifySessionID([]string{"--session-id", "<oldID>", "--cli"}, sessionID), []string{"--session-id", sessionID, "--cli"})
 }
--- a/doc/communication.md
+++ b/doc/communication.md
@ -2,13 +2,13 @@
 ## First login and sync
-When user logs in to the bridge for the first time, immediately starts the first sync.
+When user logs in to the bridge for the first time, immediatelly starts the first sync.
 First sync downloads all headers of all e-mails and creates database to have proper UIDs
 and indexes for IMAP. See [database](database.md) for more information.
 By default, whenever it's possible, sync downloads only all e-mails maiblox which already
 have list of labels so we can construct all mailboxes (inbox, sent, trash, custom folders
-and labels) without need to download each e-mail headers many times.
+and lables) without need to download each e-mail headers many times.
 Note that we need to download also bodies to calculate size of the e-mail and set proper
 content type (clients uses content type for guess if e-mail contains attachment)--but only
@ -22,7 +22,7 @@ client right after adding account.
 When account is added to client, client start the sync. This sync will ask Bridge app
 for all headers (done quickly) and then starts to download all bodies and attachment.
-Unfortunately for some e-mail more than once if the same e-mail is in more mailboxes
+Unfortunatelly for some e-mail more than once if the same e-mail is in more mailboxes
 (e.g. inbox and all mail)--there is no way to tell over IMAP it's the same message.
 After successful login of client to IMAP, Bridge starts event loop. That periodicly ask
@ -37,7 +37,7 @@ sequenceDiagram
    Note right of B: Set up PM account<br/>by user
    loop First sync
-        B ->> S: Fetch body and attachments
+        B ->> S: Fetch body and attachements
        Note right of B: Build local database<br/>(e-mail UIDs)
    end
@ -58,8 +58,8 @@ sequenceDiagram
        C ->> B: IMAP SELECT directory
        C ->> B: IMAP SEARCH e-mails UIDs
        C ->> B: IMAP FETCH of e-mail UID
-        B ->> S: Fetch body and attachments
+        B ->> S: Fetch body and attachements
-        Note right of B: Decrypt message<br/>and attachment
+        Note right of B: Decrypt message<br/>and attachement
        B ->> C: IMAP response
    end
 ```
--- a/doc/updates.md
+++ b/doc/updates.md
@ -1,12 +1,12 @@
 # Update mechanism of Bridge
-There are multiple options how to change version of application:
+There are mulitple options how to change version of application:
 * Automatic in-app update
 * Manual in-app update
 * Manual install
 In-app update ends with restarting bridge into new version. Automatic in-app
-update is downloading, verifying and installing the new version immediately
+update is downloading, verifying and installing the new version immediatelly
 without user confirmation. For manual in-app update user needs to confirm first.
 Update is done from special update file published on website.
@ -25,7 +25,7 @@ The bridge is installed and executed differently for given OS:
 * macOS app does not use launcher
    * No launcher, only one executable
-    * In-App update replaces the bridge files in installation path directly
+    * In-App udpate replaces the bridge files in installation path directly
 ```mermaid
--- a/extern/vcpkg
+++ b/extern/vcpkg
--- a/go.mod
+++ b/go.mod
@ -1,30 +1,27 @@
 module github.com/ProtonMail/proton-bridge/v3
-go 1.21
+go 1.20
 toolchain go1.21.9
 require (
 	github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
 	github.com/Masterminds/semver/v3 v3.2.0
-	github.com/ProtonMail/gluon v0.17.1-0.20240514133734-79cdd0fec41c
+	github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4
 	github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
-	github.com/ProtonMail/go-proton-api v0.4.1-0.20240605113119-1a81ec7dc72d
+	github.com/ProtonMail/go-proton-api v0.4.1-0.20230727082922-9115b4750ec7
-	github.com/ProtonMail/gopenpgp/v2 v2.7.4-proton
+	github.com/ProtonMail/gopenpgp/v2 v2.7.1-proton
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/abiosoft/ishell v2.0.0+incompatible
 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
 	github.com/bradenaw/juniper v0.12.0
 	github.com/cucumber/godog v0.12.5
 	github.com/cucumber/messages-go/v16 v16.0.1
-	github.com/docker/docker-credential-helpers v0.8.1
+	github.com/docker/docker-credential-helpers v0.6.3
-	github.com/elastic/go-sysinfo v1.11.2-0.20231129083954-35e55cd2a542
+	github.com/elastic/go-sysinfo v1.8.1
 	github.com/emersion/go-imap v1.2.1
 	github.com/emersion/go-imap-id v0.0.0-20190926060100-f94a56b9ecde
 	github.com/emersion/go-message v0.16.0
 	github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
 	github.com/emersion/go-smtp v0.15.1-0.20221021114529-49b17434419d
 	github.com/emersion/go-vcard v0.0.0-20230331202150-f3d26859ccd3
 	github.com/fatih/color v1.13.0
 	github.com/getsentry/sentry-go v0.15.0
 	github.com/go-resty/resty/v2 v2.7.0
@ -34,29 +31,28 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba
 	github.com/jeandeaual/go-locale v0.0.0-20220711133428-7de61946b173
 	github.com/keybase/go-keychain v0.0.0
 	github.com/miekg/dns v1.1.50
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/profile v1.7.0
 	github.com/sirupsen/logrus v1.9.2
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.8.3
 	github.com/urfave/cli/v2 v2.24.4
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 	go.uber.org/goleak v1.2.1
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
-	golang.org/x/net v0.24.0
+	golang.org/x/net v0.10.0
-	golang.org/x/sys v0.19.0
+	golang.org/x/sys v0.8.0
-	golang.org/x/text v0.14.0
+	golang.org/x/text v0.9.0
-	google.golang.org/grpc v1.56.3
+	google.golang.org/grpc v1.53.0
-	google.golang.org/protobuf v1.33.0
+	google.golang.org/protobuf v1.30.0
 	howett.net/plist v1.0.0
 )
 require (
 	github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230717121622-edf196117233 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
 	github.com/ProtonMail/go-srp v0.0.7 // indirect
 	github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db // indirect
@ -64,14 +60,15 @@ require (
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/chzyer/test v1.0.0 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/cronokirby/saferith v0.33.0 // indirect
 	github.com/cucumber/gherkin-go/v19 v19.0.3 // indirect
-	github.com/danieljoos/wincred v1.2.1 // indirect
+	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/elastic/go-windows v1.0.1 // indirect
 	github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect
 	github.com/emersion/go-vcard v0.0.0-20230331202150-f3d26859ccd3 // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@ -82,7 +79,7 @@ require (
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gofrs/uuid v4.3.0+incompatible // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@ -95,14 +92,14 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v1.14.22 // indirect
+	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
@ -111,19 +108,17 @@ require (
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
 	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sync v0.2.0 // indirect
 	golang.org/x/tools v0.6.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 replace (
 	github.com/docker/docker-credential-helpers => github.com/ProtonMail/docker-credential-helpers v1.1.0
 	github.com/emersion/go-message => github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7
-	github.com/emersion/go-smtp => github.com/ProtonMail/go-smtp v0.0.0-20231109081432-2b3d50599865
+	github.com/keybase/go-keychain => github.com/cuthix/go-keychain v0.0.0-20230517073537-fc1740a83768
 	github.com/go-resty/resty/v2 => github.com/LBeernaertProton/resty/v2 v2.0.0-20231129100320-dddf8030d93a
 	github.com/keybase/go-keychain => github.com/cuthix/go-keychain v0.0.0-20240103134243-0b6a41580b77
 )
--- a/go.sum
+++ b/go.sum
@ -11,52 +11,42 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 fyne.io/fyne v1.4.2/go.mod h1:xL4c3WmpE/Tvz5CEm5vqsaizU/EeOCm9DYlL2GtTSiM=
 github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557 h1:l6surSnJ3RP4qA1qmKJ+hQn3UjytosdoG27WGjrDlVs=
 github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557/go.mod h1:sTrmvD/TxuypdOERsDOS7SndZg0rzzcCi1b6wQMXUYM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
 github.com/LBeernaertProton/resty/v2 v2.0.0-20231129100320-dddf8030d93a h1:eQO/GF/+H8/9udc9QAgieFr+jr1tjXlJo35RAhsUbWY=
 github.com/LBeernaertProton/resty/v2 v2.0.0-20231129100320-dddf8030d93a/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
 github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod h1:HecWFHognK8GfRDGnFQbW/LiV7A3MX3gZVs45vk5h8I=
 github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs69zUkSzubzjBbL+cmOXgnmt9Fyd9ug=
 github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo=
-github.com/ProtonMail/gluon v0.17.1-0.20240423123310-0266b0f75d41 h1:Lu2hKO4fcHeMcbZOon129iM1dAy0ERwZkJtuNQCLlOQ=
+github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkFn/XLzSqPOB5AAthuk9xPk=
-github.com/ProtonMail/gluon v0.17.1-0.20240423123310-0266b0f75d41/go.mod h1:0/c03TzZPNiSgY5UDJK1iRDkjlDPwWugxTT6et2qDu8=
+github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g=
-github.com/ProtonMail/gluon v0.17.1-0.20240514133734-79cdd0fec41c h1:P3SvCACt13Zqdj0IRDB4bgwqI68+oMB2j0uVuPQyoTw=
+github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4 h1:Uq2v2NYEtlTaK2WTh9BMph2Kv51JxMgvTkd7CjGPYc8=
-github.com/ProtonMail/gluon v0.17.1-0.20240514133734-79cdd0fec41c/go.mod h1:0/c03TzZPNiSgY5UDJK1iRDkjlDPwWugxTT6et2qDu8=
+github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4/go.mod h1:Og5/Dz1MiGpCJn51XujZwxiLG7WzvvjE5PRpZBQmAHo=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
 github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
-github.com/ProtonMail/go-crypto v0.0.0-20230717121622-edf196117233 h1:bdoKdh0f66/lrgVfYlxw0aqISY/KOqXmFJyGt7rGmnc=
+github.com/ProtonMail/go-crypto v0.0.0-20230322105811-d73448b7e800/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
-github.com/ProtonMail/go-crypto v0.0.0-20230717121622-edf196117233/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
+github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 h1:ZK3C5DtzV2nVAQTx5S5jQvMeDqWtD1By5mOoyY/xJek=
 github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
 github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7 h1:+j+Kd/DyZ/qGfMT9htAT7HxqIEbZHsatsx+m8AoV6fc=
 github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7/go.mod h1:NBAn21zgCJ/52WLDyed18YvYFm5tEoeDauubFqLokM4=
 github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ekTTXpdwKYF8eBlsYsDVoggDAuAjoK66k=
 github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw=
-github.com/ProtonMail/go-proton-api v0.4.1-0.20240423123404-a6163268401c h1:3U245DPGyL+LeAcJzFSg+E2lShXx+z/lBHM2v9P5mEg=
+github.com/ProtonMail/go-proton-api v0.4.1-0.20230727082922-9115b4750ec7 h1:Rmg3TPK6vFGNWR4hxmPoBhV75Sl716iB46wEi2U4Q+c=
-github.com/ProtonMail/go-proton-api v0.4.1-0.20240423123404-a6163268401c/go.mod h1:3A0cpdo0BIenIPjTG6u8EbzJ8uuJy7rVvM/NaynjCKA=
+github.com/ProtonMail/go-proton-api v0.4.1-0.20230727082922-9115b4750ec7/go.mod h1:+aTJoYu8bqzGECXL2DOdiZTZ64bGn3w0NC8VcFpJrFM=
 github.com/ProtonMail/go-proton-api v0.4.1-0.20240605113119-1a81ec7dc72d h1:B9/ZLubPWIY4uvATviFoCUoLauq98C3Bbt4v0A2VEdU=
 github.com/ProtonMail/go-proton-api v0.4.1-0.20240605113119-1a81ec7dc72d/go.mod h1:3A0cpdo0BIenIPjTG6u8EbzJ8uuJy7rVvM/NaynjCKA=
 github.com/ProtonMail/go-smtp v0.0.0-20231109081432-2b3d50599865 h1:EP1gnxLL5Z7xBSymE9nSTM27nRYINuvssAtDmG0suD8=
 github.com/ProtonMail/go-smtp v0.0.0-20231109081432-2b3d50599865/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
 github.com/ProtonMail/go-srp v0.0.7 h1:Sos3Qk+th4tQR64vsxGIxYpN3rdnG9Wf9K4ZloC1JrI=
 github.com/ProtonMail/go-srp v0.0.7/go.mod h1:giCp+7qRnMIcCvI6V6U3S1lDDXDQYx2ewJ6F/9wdlJk=
-github.com/ProtonMail/gopenpgp/v2 v2.7.4-proton h1:8tqHYM6IGsdEc6Vxf1TWiwpHNj8yIEQNACPhxsDagrk=
+github.com/ProtonMail/gopenpgp/v2 v2.7.1-proton h1:YS6M20yvjCJPR1r4ADW5TPn6rahs4iAyZaACei86bEc=
-github.com/ProtonMail/gopenpgp/v2 v2.7.4-proton/go.mod h1:omVkSsfPAhmptzPF/piMXb16wKIWUvVhZbVW7sJKh0A=
+github.com/ProtonMail/gopenpgp/v2 v2.7.1-proton/go.mod h1:S1lYsaGHykYpxxh2SnJL6ypcAlANKj5NRSY6HxKryKQ=
 github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
 github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
 github.com/abiosoft/ishell v2.0.0+incompatible h1:zpwIuEHc37EzrsIYah3cpevrIc8Oma7oZPxr03tlmmw=
 github.com/abiosoft/ishell v2.0.0+incompatible/go.mod h1:HQR9AqF2R3P4XXpMpI0NAzgHf/aS6+zVXRj14cVk9qg=
 github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db h1:CjPUSXOiYptLbTdr1RceuZgSFDQ7U15ITERUGrUORx8=
 github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod h1:rB3B4rKii8V21ydCbIzH5hZiCQE7f5E9SzUb/ZZx530=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37 h1:28uU3TtuvQ6KRndxg9TrC868jBWmSKgh0GTXkACCXmA=
@ -74,7 +64,6 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/bradenaw/juniper v0.12.0 h1:Q/7icpPQD1nH/La5DobQfNEtwyrBSiSu47jOQx7lJEM=
 github.com/bradenaw/juniper v0.12.0/go.mod h1:Z2B7aJlQ7xbfWsnMLROj5t/5FQ94/MkIdKC30J4WvzI=
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
@ -91,9 +80,8 @@ github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
 github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@ -111,27 +99,18 @@ github.com/cucumber/godog v0.12.5/go.mod h1:u6SD7IXC49dLpPN35kal0oYEjsXZWee4pW6T
 github.com/cucumber/messages-go/v16 v16.0.0/go.mod h1:EJcyR5Mm5ZuDsKJnT2N9KRnBK30BGjtYotDKpwQ0v6g=
 github.com/cucumber/messages-go/v16 v16.0.1 h1:fvkpwsLgnIm0qugftrw2YwNlio+ABe2Iu94Ap8GMYIY=
 github.com/cucumber/messages-go/v16 v16.0.1/go.mod h1:EJcyR5Mm5ZuDsKJnT2N9KRnBK30BGjtYotDKpwQ0v6g=
-github.com/cuthix/go-keychain v0.0.0-20240103134243-0b6a41580b77 h1:sdB/yJMbubPQothFl6KYCOrMBRgy0pZbBXIWoJqSFLo=
+github.com/cuthix/go-keychain v0.0.0-20230517073537-fc1740a83768 h1:Jrcoxtrk4qpuzKIYPlEkjIK0M+bABs0oW2QzrOuwlzk=
-github.com/cuthix/go-keychain v0.0.0-20240103134243-0b6a41580b77/go.mod h1:ZoZU1fnBy3mOLWr3Pg+Y2+nTKtu6ypDte2kZg9HvSwY=
+github.com/cuthix/go-keychain v0.0.0-20230517073537-fc1740a83768/go.mod h1:ZoZU1fnBy3mOLWr3Pg+Y2+nTKtu6ypDte2kZg9HvSwY=
-github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs=
+github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
-github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5FdCcyfPwps=
+github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
 github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
+github.com/elastic/go-sysinfo v1.8.1 h1:4Yhj+HdV6WjbCRgGdZpPJ8lZQlXZLKDAeIkmQ/VRvi4=
-github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/elastic/go-sysinfo v1.8.1/go.mod h1:JfllUnzoQV/JRYymbH3dO1yggI3mV2oTKSXsDHM+uIM=
 github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
 github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
 github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/elastic/go-sysinfo v1.11.2-0.20231129083954-35e55cd2a542 h1:IFTm6NBbfSgZCaeEzorQhH4T7ZERl4j+1u7oXWzmJcM=
 github.com/elastic/go-sysinfo v1.11.2-0.20231129083954-35e55cd2a542/go.mod h1:GKqR8bbMK/1ITnez9NIsIfXQr25aLhRJa7AfT8HpBFQ=
 github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
 github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
 github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA=
@ -141,6 +120,8 @@ github.com/emersion/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod h1:sPwp
 github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
 github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
 github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
 github.com/emersion/go-smtp v0.15.1-0.20221021114529-49b17434419d h1:hFRM6zCBSc+Xa0rBOqSlG6Qe9dKC/2vLhGAuZlWxTsc=
 github.com/emersion/go-smtp v0.15.1-0.20221021114529-49b17434419d/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
 github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
 github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
 github.com/emersion/go-vcard v0.0.0-20230331202150-f3d26859ccd3 h1:hQ1wTMaKcGfobYRT88RM8NFNyX+IQHvagkm/tqViU98=
@ -153,9 +134,6 @@ github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNu
 github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BMXYYRWTLOJKlh+lOBt6nUQgXAfB7oVIQt5cNreqSLI=
 github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:rZfgFAXFS/z/lEd6LJmf9HVZ1LkgYiHx5pHhV5DR16M=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fyne-io/mobile v0.1.2-0.20201127155338-06aeb98410cc/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
 github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/getsentry/sentry-go v0.15.0 h1:CP9bmA7pralrVUedYZsmIHWpq/pBtXTSew7xvVpfLaA=
@ -166,35 +144,29 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
 github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
 github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc=
 github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@ -206,8 +178,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@ -268,16 +240,12 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc=
 github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg=
 github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jeandeaual/go-locale v0.0.0-20220711133428-7de61946b173 h1:jOONCXyzHWM+ukp+weX77o//U3pMeOj62CNxChJLxIU=
 github.com/jeandeaual/go-locale v0.0.0-20220711133428-7de61946b173/go.mod h1:uO/uctjf8AcWhNfp5Ili6oPtyFrAoQXEtVY3N798VkQ=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=
 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@ -295,14 +263,11 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
 github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a/go.mod h1:ORP3/rB5IsulLEBwQZCJyyV6niqmI7P4EWSmkug+1Ng=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@ -317,8 +282,8 @@ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
@ -338,16 +303,9 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nicksnyder/go-i18n/v2 v2.1.1/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
@ -357,7 +315,6 @@ github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNc
 github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
 github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@ -375,8 +332,8 @@ github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7q
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
@ -384,7 +341,6 @@ github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@ -408,8 +364,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4=
 github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@ -426,9 +380,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
@ -444,11 +397,8 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a h1:DxppxFKRqJ8WD6oJ3+ZXKDY0iMONQDl5UTg2aTyHh8k=
 gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a/go.mod h1:NREvu3a57BaK0R1+ztrEzHWiZAihohNLQ6trPxlIqZI=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@ -467,11 +417,9 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@ -481,7 +429,6 @@ golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERs
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@ -493,7 +440,6 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
@ -512,22 +458,18 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -536,12 +478,11 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -556,60 +497,44 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@ -623,13 +548,11 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190808195139-e713427fea3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200328031815-3db5fc6bac03/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
@ -657,21 +580,20 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
+google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 h1:muK+gVBJBfFb4SejshDBlN2/UgxCCOKH9Y34ljqEGOc=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
+google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
+google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
-google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
@ -683,7 +605,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--- a/internal/app/app.go
+++ b/internal/app/app.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -26,7 +26,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
 	"time"
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/gluon/async"
@ -42,9 +41,7 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
 	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/restarter"
 	"github.com/elastic/go-sysinfo"
 	"github.com/pkg/profile"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@ -55,9 +52,6 @@ const (
 	flagCPUProfile      = "cpu-prof"
 	flagCPUProfileShort = "p"
 	flagTraceProfile      = "trace-prof"
 	flagTraceProfileShort = "t"
 	flagMemProfile      = "mem-prof"
 	flagMemProfileShort = "m"
@ -83,7 +77,7 @@ const (
 	flagNoWindow         = "no-window"
 	flagParentPID        = "parent-pid"
 	flagSoftwareRenderer = "software-renderer"
-	FlagSessionID        = "session-id"
+	flagSessionID        = "session-id"
 )
 const (
@ -102,11 +96,6 @@ func New() *cli.App {
 			Aliases: []string{flagCPUProfileShort},
 			Usage:   "Generate CPU profile",
 		},
 		&cli.BoolFlag{
 			Name:    flagTraceProfile,
 			Aliases: []string{flagTraceProfileShort},
 			Usage:   "Generate Trace profile",
 		},
 		&cli.BoolFlag{
 			Name:    flagMemProfile,
 			Aliases: []string{flagMemProfileShort},
@ -165,7 +154,7 @@ func New() *cli.App {
 			Value:  false,
 		},
 		&cli.StringFlag{
-			Name:   FlagSessionID,
+			Name:   flagSessionID,
 			Hidden: true,
 		},
 	}
@ -207,7 +196,7 @@ func run(c *cli.Context) error {
 	}()
 	// Restart the app if requested.
-	err = withRestarter(exe, func(restarter *restarter.Restarter) error {
+	return withRestarter(exe, func(restarter *restarter.Restarter) error {
 		// Handle crashes with various actions.
 		return withCrashHandler(restarter, reporter, func(crashHandler *crash.Handler, quitCh <-chan struct{}) error {
 			migrationErr := migrateOldVersions()
@ -237,56 +226,53 @@ func run(c *cli.Context) error {
 						}
 						return withSingleInstance(settings, locations.GetLockFile(), version, func() error {
-							// Look for available keychains
+							// Unlock the encrypted vault.
-							return WithKeychainList(crashHandler, func(keychains *keychain.List) error {
+							return WithVault(locations, crashHandler, func(v *vault.Vault, insecure, corrupt bool) error {
-								// Unlock the encrypted vault.
+								if !v.Migrated() {
-								return WithVault(locations, keychains, crashHandler, func(v *vault.Vault, insecure, corrupt bool) error {
+									// Migrate old settings into the vault.
-									if !v.Migrated() {
+									if err := migrateOldSettings(v); err != nil {
-										// Migrate old settings into the vault.
+										logrus.WithError(err).Error("Failed to migrate old settings")
 										if err := migrateOldSettings(v); err != nil {
 											logrus.WithError(err).Error("Failed to migrate old settings")
 										}
 										// Migrate old accounts into the vault.
 										if err := migrateOldAccounts(locations, keychains, v); err != nil {
 											logrus.WithError(err).Error("Failed to migrate old accounts")
 										}
 										// The vault has been migrated.
 										if err := v.SetMigrated(); err != nil {
 											logrus.WithError(err).Error("Failed to mark vault as migrated")
 										}
 									}
-									logrus.WithFields(logrus.Fields{
+									// Migrate old accounts into the vault.
-										"lastVersion": v.GetLastVersion().String(),
+									if err := migrateOldAccounts(locations, v); err != nil {
-										"showAllMail": v.GetShowAllMail(),
+										logrus.WithError(err).Error("Failed to migrate old accounts")
-										"updateCh":    v.GetUpdateChannel(),
+									}
 										"autoUpdate":  v.GetAutoUpdate(),
 										"rollout":     v.GetUpdateRollout(),
 										"DoH":         v.GetProxyAllowed(),
 									}).Info("Vault loaded")
-									// Load the cookies from the vault.
+									// The vault has been migrated.
-									return withCookieJar(v, func(cookieJar http.CookieJar) error {
+									if err := v.SetMigrated(); err != nil {
-										// Create a new bridge instance.
+										logrus.WithError(err).Error("Failed to mark vault as migrated")
-										return withBridge(c, exe, locations, version, identifier, crashHandler, reporter, v, cookieJar, keychains, func(b *bridge.Bridge, eventCh <-chan events.Event) error {
+									}
-											if insecure {
+								}
 												logrus.Warn("The vault key could not be retrieved; the vault will not be encrypted")
 												b.PushError(bridge.ErrVaultInsecure)
 											}
-											if corrupt {
+								logrus.WithFields(logrus.Fields{
-												logrus.Warn("The vault is corrupt and has been wiped")
+									"lastVersion": v.GetLastVersion().String(),
-												b.PushError(bridge.ErrVaultCorrupt)
+									"showAllMail": v.GetShowAllMail(),
-											}
+									"updateCh":    v.GetUpdateChannel(),
 									"autoUpdate":  v.GetAutoUpdate(),
 									"rollout":     v.GetUpdateRollout(),
 									"DoH":         v.GetProxyAllowed(),
 								}).Info("Vault loaded")
-											// Remove old updates files
+								// Load the cookies from the vault.
-											b.RemoveOldUpdates()
+								return withCookieJar(v, func(cookieJar http.CookieJar) error {
 									// Create a new bridge instance.
 									return withBridge(c, exe, locations, version, identifier, crashHandler, reporter, v, cookieJar, func(b *bridge.Bridge, eventCh <-chan events.Event) error {
 										if insecure {
 											logrus.Warn("The vault key could not be retrieved; the vault will not be encrypted")
 											b.PushError(bridge.ErrVaultInsecure)
 										}
-											// Run the frontend.
+										if corrupt {
-											return runFrontend(c, crashHandler, restarter, locations, b, eventCh, quitCh, c.Int(flagParentPID))
+											logrus.Warn("The vault is corrupt and has been wiped")
-										})
+											b.PushError(bridge.ErrVaultCorrupt)
 										}
 										// Start telemetry heartbeat process
 										b.StartHeartbeat(b)
 										// Run the frontend.
 										return runFrontend(c, crashHandler, restarter, locations, b, eventCh, quitCh, c.Int(flagParentPID))
 									})
 								})
 							})
@ -296,13 +282,6 @@ func run(c *cli.Context) error {
 			})
 		})
 	})
 	// if an error occurs, it must be logged now because we're about to close the log file.
 	if err != nil {
 		logrus.Fatal(err)
 	}
 	return err
 }
 // If there's another instance already running, try to raise it and exit.
@ -346,7 +325,7 @@ func withLogging(c *cli.Context, crashHandler *crash.Handler, locations *locatio
 	logrus.WithField("path", logsPath).Debug("Received logs path")
 	// Initialize logging.
-	sessionID := logging.NewSessionIDFromString(c.String(FlagSessionID))
+	sessionID := logging.NewSessionIDFromString(c.String(flagSessionID))
 	var closer io.Closer
 	if closer, err = logging.Init(
 		logsPath,
@ -373,24 +352,6 @@ func withLogging(c *cli.Context, crashHandler *crash.Handler, locations *locatio
 		WithField("SentryID", sentry.GetProtectedHostname()).
 		Info("Run app")
 	now := time.Now()
 	logrus.
 		WithField("timeZone", now.Format("MST")).
 		WithField("offset", now.Format("-07:00:00")).
 		Info("Time zone info")
 	host, err := sysinfo.Host()
 	if err != nil {
 		logrus.WithError(err).Error("Could not retrieve operating system info")
 	} else {
 		osInfo := host.Info().OS
 		logrus.
 			WithField("name", osInfo.Name).
 			WithField("version", osInfo.Version).
 			WithField("build", osInfo.Build).
 			Info("Operating system info")
 	}
 	return fn(closer)
 }
@ -418,11 +379,6 @@ func withProfiler(c *cli.Context, fn func() error) error {
 		defer profile.Start(profile.CPUProfile, profile.ProfilePath(".")).Stop()
 	}
 	if c.Bool(flagTraceProfile) {
 		logrus.Debug("Running with Trace profiling")
 		defer profile.Start(profile.TraceProfile, profile.ProfilePath(".")).Stop()
 	}
 	if c.Bool(flagMemProfile) {
 		logrus.Debug("Running with memory profiling")
 		defer profile.Start(profile.MemProfile, profile.MemProfileAllocs, profile.ProfilePath(".")).Stop()
@ -501,14 +457,6 @@ func withCookieJar(vault *vault.Vault, fn func(http.CookieJar) error) error {
 	return fn(persister)
 }
 // WithKeychainList init the list of usable keychains.
 func WithKeychainList(panicHandler async.PanicHandler, fn func(*keychain.List) error) error {
 	logrus.Debug("Creating keychain list")
 	defer logrus.Debug("Keychain list stop")
 	defer async.HandlePanic(panicHandler)
 	return fn(keychain.NewList())
 }
 func setDeviceCookies(jar *cookies.Jar) error {
 	url, err := url.Parse(constants.APIHost)
 	if err != nil {
--- a/internal/app/bridge.go
+++ b/internal/app/bridge.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -37,7 +37,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/ProtonMail/proton-bridge/v3/internal/versioner"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
@ -56,7 +55,6 @@ func withBridge(
 	reporter *sentry.Reporter,
 	vault *vault.Vault,
 	cookieJar http.CookieJar,
 	keychains *keychain.List,
 	fn func(*bridge.Bridge, <-chan events.Event) error,
 ) error {
 	logrus.Debug("Creating bridge")
@ -99,7 +97,6 @@ func withBridge(
 		autostarter,
 		updater,
 		version,
 		keychains,
 		// The API stuff.
 		constants.APIHost,
@ -113,7 +110,6 @@ func withBridge(
 		crashHandler,
 		reporter,
 		imap.DefaultEpochUIDValidityGenerator(),
 		nil,
 		// The logging stuff.
 		c.String(flagLogIMAP) == "client" || c.String(flagLogIMAP) == "all",
@ -159,7 +155,7 @@ func newUpdater(locations *locations.Locations) (*updater.Updater, error) {
 	}
 	return updater.NewUpdater(
-		versioner.New(updatesDir),
+		updater.NewInstaller(versioner.New(updatesDir)),
 		verifier,
 		constants.UpdateName,
 		runtime.GOOS,
--- a/internal/app/frontend.go
+++ b/internal/app/frontend.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/app/migration.go
+++ b/internal/app/migration.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -43,7 +43,7 @@ import (
 // nolint:gosec
 func migrateKeychainHelper(locations *locations.Locations) error {
-	logrus.Trace("Checking if keychain helper needs to be migrated")
+	logrus.Info("Migrating keychain helper")
 	settings, err := locations.ProvideSettingsPath()
 	if err != nil {
@ -75,11 +75,7 @@ func migrateKeychainHelper(locations *locations.Locations) error {
 		return fmt.Errorf("failed to unmarshal old prefs file: %w", err)
 	}
-	err = vault.SetHelper(settings, prefs.Helper)
+	return vault.SetHelper(settings, prefs.Helper)
 	if err == nil {
 		logrus.Info("Keychain helper has been migrated")
 	}
 	return err
 }
 // nolint:gosec
@ -126,7 +122,7 @@ func migrateOldSettingsWithDir(configDir string, v *vault.Vault) error {
 	return v.SetBridgeTLSCertKey(certPEM, keyPEM)
 }
-func migrateOldAccounts(locations *locations.Locations, keychains *keychain.List, v *vault.Vault) error {
+func migrateOldAccounts(locations *locations.Locations, v *vault.Vault) error {
 	logrus.Info("Migrating accounts")
 	settings, err := locations.ProvideSettingsPath()
@ -138,7 +134,8 @@ func migrateOldAccounts(locations *locations.Locations, keychains *keychain.List
 	if err != nil {
 		return fmt.Errorf("failed to get helper: %w", err)
 	}
-	keychain, err := keychain.NewKeychain(helper, "bridge", keychains.GetHelpers(), keychains.GetDefaultHelper())
+
 	keychain, err := keychain.NewKeychain(helper, "bridge")
 	if err != nil {
 		return fmt.Errorf("failed to create keychain: %w", err)
 	}
--- a/internal/app/migration_test.go
+++ b/internal/app/migration_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -35,6 +35,7 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/algo"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	dockerCredentials "github.com/docker/docker-credential-helpers/credentials"
 	"github.com/stretchr/testify/require"
 )
@ -42,7 +43,7 @@ func TestMigratePrefsToVaultWithKeys(t *testing.T) {
 	// Create a new vault.
 	vault, corrupt, err := vault.New(t.TempDir(), t.TempDir(), []byte("my secret key"), async.NoopPanicHandler{})
 	require.NoError(t, err)
-	require.NoError(t, corrupt)
+	require.False(t, corrupt)
 	// load the old prefs file.
 	configDir := filepath.Join("testdata", "with_keys")
@ -63,7 +64,7 @@ func TestMigratePrefsToVaultWithoutKeys(t *testing.T) {
 	// Create a new vault.
 	vault, corrupt, err := vault.New(t.TempDir(), t.TempDir(), []byte("my secret key"), async.NoopPanicHandler{})
 	require.NoError(t, err)
-	require.NoError(t, corrupt)
+	require.False(t, corrupt)
 	// load the old prefs file.
 	configDir := filepath.Join("testdata", "without_keys")
@ -132,9 +133,11 @@ func TestKeychainMigration(t *testing.T) {
 }
 func TestUserMigration(t *testing.T) {
-	kcl := keychain.NewTestKeychainsList()
+	keychainHelper := keychain.NewTestHelper()
-	kc, err := keychain.NewKeychain("mock", "bridge", kcl.GetHelpers(), kcl.GetDefaultHelper())
+	keychain.Helpers["mock"] = func(string) (dockerCredentials.Helper, error) { return keychainHelper, nil }
 	kc, err := keychain.NewKeychain("mock", "bridge")
 	require.NoError(t, err)
 	require.NoError(t, kc.Put("brokenID", "broken"))
@ -173,9 +176,9 @@ func TestUserMigration(t *testing.T) {
 	v, corrupt, err := vault.New(settingsFolder, settingsFolder, token, async.NoopPanicHandler{})
 	require.NoError(t, err)
-	require.NoError(t, corrupt)
+	require.False(t, corrupt)
-	require.NoError(t, migrateOldAccounts(locations, kcl, v))
+	require.NoError(t, migrateOldAccounts(locations, v))
 	require.Equal(t, []string{wantCredentials.UserID}, v.GetUserIDs())
 	require.NoError(t, v.GetUser(wantCredentials.UserID, func(u *vault.User) {
--- a/internal/app/singleinstance.go
+++ b/internal/app/singleinstance.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/app/vault.go
+++ b/internal/app/vault.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -30,37 +30,47 @@ import (
 	"github.com/sirupsen/logrus"
 )
-func WithVault(locations *locations.Locations, keychains *keychain.List, panicHandler async.PanicHandler, fn func(*vault.Vault, bool, bool) error) error {
+func WithVault(locations *locations.Locations, panicHandler async.PanicHandler, fn func(*vault.Vault, bool, bool) error) error {
 	logrus.Debug("Creating vault")
 	defer logrus.Debug("Vault stopped")
 	// Create the encVault.
-	encVault, insecure, corrupt, err := newVault(locations, keychains, panicHandler)
+	encVault, insecure, corrupt, err := newVault(locations, panicHandler)
 	if err != nil {
 		return fmt.Errorf("could not create vault: %w", err)
 	}
 	logrus.WithFields(logrus.Fields{
 		"insecure": insecure,
-		"corrupt":  corrupt != nil,
+		"corrupt":  corrupt,
 	}).Debug("Vault created")
-	if corrupt != nil {
+	// Install the certificates if needed.
-		logrus.WithError(corrupt).Warn("Failed to load existing vault, vault has been reset")
+	if installed := encVault.GetCertsInstalled(); !installed {
-	}
+		logrus.Debug("Installing certificates")
-	cert, _ := encVault.GetBridgeTLSCert()
+		certPEM, _ := encVault.GetBridgeTLSCert()
-	certs.NewInstaller().LogCertInstallStatus(cert)
+
 		if err := certs.NewInstaller().InstallCert(certPEM); err != nil {
 			return fmt.Errorf("failed to install certs: %w", err)
 		}
 		if err := encVault.SetCertsInstalled(true); err != nil {
 			return fmt.Errorf("failed to set certs installed: %w", err)
 		}
 		logrus.Debug("Certificates successfully installed")
 	}
 	// GODT-1950: Add teardown actions (e.g. to close the vault).
-	return fn(encVault, insecure, corrupt != nil)
+	return fn(encVault, insecure, corrupt)
 }
-func newVault(locations *locations.Locations, keychains *keychain.List, panicHandler async.PanicHandler) (*vault.Vault, bool, error, error) {
+func newVault(locations *locations.Locations, panicHandler async.PanicHandler) (*vault.Vault, bool, bool, error) {
 	vaultDir, err := locations.ProvideSettingsPath()
 	if err != nil {
-		return nil, false, nil, fmt.Errorf("could not get vault dir: %w", err)
+		return nil, false, false, fmt.Errorf("could not get vault dir: %w", err)
 	}
 	logrus.WithField("vaultDir", vaultDir).Debug("Loading vault from directory")
@ -70,7 +80,7 @@ func newVault(locations *locations.Locations, keychains *keychain.List, panicHan
 		insecure bool
 	)
-	if key, err := loadVaultKey(vaultDir, keychains); err != nil {
+	if key, err := loadVaultKey(vaultDir); err != nil {
 		logrus.WithError(err).Error("Could not load/create vault key")
 		insecure = true
@ -82,37 +92,36 @@ func newVault(locations *locations.Locations, keychains *keychain.List, panicHan
 	gluonCacheDir, err := locations.ProvideGluonCachePath()
 	if err != nil {
-		return nil, false, nil, fmt.Errorf("could not provide gluon path: %w", err)
+		return nil, false, false, fmt.Errorf("could not provide gluon path: %w", err)
 	}
 	vault, corrupt, err := vault.New(vaultDir, gluonCacheDir, vaultKey, panicHandler)
 	if err != nil {
-		return nil, false, corrupt, fmt.Errorf("could not create vault: %w", err)
+		return nil, false, false, fmt.Errorf("could not create vault: %w", err)
 	}
 	return vault, insecure, corrupt, nil
 }
-func loadVaultKey(vaultDir string, keychains *keychain.List) ([]byte, error) {
+func loadVaultKey(vaultDir string) ([]byte, error) {
 	helper, err := vault.GetHelper(vaultDir)
 	if err != nil {
 		return nil, fmt.Errorf("could not get keychain helper: %w", err)
 	}
-	kc, err := keychain.NewKeychain(helper, constants.KeyChainName, keychains.GetHelpers(), keychains.GetDefaultHelper())
+	kc, err := keychain.NewKeychain(helper, constants.KeyChainName)
 	if err != nil {
 		return nil, fmt.Errorf("could not create keychain: %w", err)
 	}
-	key, err := vault.GetVaultKey(kc)
+	has, err := vault.HasVaultKey(kc)
 	if err != nil {
 		if keychain.IsErrKeychainNoItem(err) {
 			logrus.WithError(err).Warn("no vault key found, generating new")
 			return vault.NewVaultKey(kc)
 		}
 		return nil, fmt.Errorf("could not check for vault key: %w", err)
 	}
-	return key, nil
+	if has {
 		return vault.GetVaultKey(kc)
 	}
 	return vault.NewVaultKey(kc)
 }
--- a/internal/bridge/api.go
+++ b/internal/bridge/api.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -40,7 +40,7 @@ func defaultAPIOptions(
 		proton.WithAppVersion(constants.AppVersion(version.Original())),
 		proton.WithCookieJar(cookieJar),
 		proton.WithTransport(transport),
-		proton.WithLogger(logrus.WithField("pkg", "gpa/client")),
+		proton.WithLogger(logrus.StandardLogger()),
 		proton.WithPanicHandler(panicHandler),
 	}
 }
--- a/internal/bridge/api_default.go
+++ b/internal/bridge/api_default.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-//go:build !build_qa && !test_integration
+//go:build !build_qa
 package bridge
--- a/internal/bridge/api_qa.go
+++ b/internal/bridge/api_qa.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-//go:build build_qa || test_integration
+//go:build build_qa
 package bridge
--- a/internal/bridge/bridge.go
+++ b/internal/bridge/bridge.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -23,6 +23,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
 	"net"
 	"net/http"
 	"sync"
 	"time"
@ -37,15 +38,11 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/ProtonMail/proton-bridge/v3/internal/focus"
 	"github.com/ProtonMail/proton-bridge/v3/internal/identifier"
 	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
 	"github.com/ProtonMail/proton-bridge/v3/internal/services/imapsmtpserver"
 	"github.com/ProtonMail/proton-bridge/v3/internal/services/syncservice"
 	"github.com/ProtonMail/proton-bridge/v3/internal/telemetry"
 	"github.com/ProtonMail/proton-bridge/v3/internal/user"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/go-resty/resty/v2"
 	"github.com/sirupsen/logrus"
@ -62,7 +59,7 @@ type Bridge struct {
 	// api manages user API clients.
 	api        *proton.Manager
 	proxyCtl   ProxyController
-	identifier identifier.Identifier
+	identifier Identifier
 	// tlsConfig holds the bridge TLS config used by the IMAP and SMTP servers.
 	tlsConfig *tls.Config
@ -75,7 +72,7 @@ type Bridge struct {
 	installCh chan installJob
 	// heartbeat is the telemetry heartbeat for metrics.
-	heartbeat *heartBeatState
+	heartbeat telemetry.Heartbeat
 	// curVersion is the current version of the bridge,
 	// newVersion is the version that was installed by the updater.
@ -83,9 +80,6 @@ type Bridge struct {
 	newVersion     *semver.Version
 	newVersionLock safe.RWMutex
 	// keychains is the utils that own usable keychains found in the OS.
 	keychains *keychain.List
 	// focusService is used to raise the bridge window when needed.
 	focusService *focus.Service
@ -128,11 +122,13 @@ type Bridge struct {
 	// goUpdate triggers a check/install of updates.
 	goUpdate func()
-	serverManager *imapsmtpserver.Service
+	// goHeartbeat triggers a check/sending if heartbeat is needed.
-	syncService   *syncservice.Service
+	goHeartbeat func()
 }
-var logPkg = logrus.WithField("pkg", "bridge") //nolint:gochecknoglobals
+	uidValidityGenerator imap.UIDValidityGenerator
 	serverManager *ServerManager
 }
 // New creates a new bridge.
 func New(
@ -141,18 +137,16 @@ func New(
 	autostarter Autostarter, // the autostarter to manage autostart settings
 	updater Updater, // the updater to fetch and install updates
 	curVersion *semver.Version, // the current version of the bridge
 	keychains *keychain.List, // usable keychains
 	apiURL string, // the URL of the API to use
 	cookieJar http.CookieJar, // the cookie jar to use
-	identifier identifier.Identifier, // the identifier to keep track of the user agent
+	identifier Identifier, // the identifier to keep track of the user agent
 	tlsReporter TLSReporter, // the TLS reporter to report TLS errors
 	roundTripper http.RoundTripper, // the round tripper to use for API requests
 	proxyCtl ProxyController, // the DoH controller
 	panicHandler async.PanicHandler,
 	reporter reporter.Reporter,
 	uidValidityGenerator imap.UIDValidityGenerator,
 	heartBeatManager telemetry.HeartbeatManager,
 	logIMAPClient, logIMAPServer bool, // whether to log IMAP client/server activity
 	logSMTP bool, // whether to log SMTP activity
@ -168,7 +162,6 @@ func New(
 	// bridge is the bridge.
 	bridge, err := newBridge(
 		context.Background(),
 		tasks,
 		imapEventCh,
@ -177,7 +170,6 @@ func New(
 		autostarter,
 		updater,
 		curVersion,
 		keychains,
 		panicHandler,
 		reporter,
@ -185,7 +177,6 @@ func New(
 		identifier,
 		proxyCtl,
 		uidValidityGenerator,
 		heartBeatManager,
 		logIMAPClient, logIMAPServer, logSMTP,
 	)
 	if err != nil {
@ -204,7 +195,6 @@ func New(
 }
 func newBridge(
 	ctx context.Context,
 	tasks *async.Group,
 	imapEventCh chan imapEvents.Event,
@ -213,15 +203,13 @@ func newBridge(
 	autostarter Autostarter,
 	updater Updater,
 	curVersion *semver.Version,
 	keychains *keychain.List,
 	panicHandler async.PanicHandler,
 	reporter reporter.Reporter,
 	api *proton.Manager,
-	identifier identifier.Identifier,
+	identifier Identifier,
 	proxyCtl ProxyController,
 	uidValidityGenerator imap.UIDValidityGenerator,
 	heartbeatManager telemetry.HeartbeatManager,
 	logIMAPClient, logIMAPServer, logSMTP bool,
 ) (*Bridge, error) {
@ -267,13 +255,9 @@ func newBridge(
 		newVersion:     curVersion,
 		newVersionLock: safe.NewRWMutex(),
 		keychains: keychains,
 		panicHandler: panicHandler,
 		reporter:     reporter,
 		heartbeat: newHeartBeatState(ctx, panicHandler),
 		focusService: focusService,
 		autostarter:  autostarter,
 		locator:      locator,
@ -285,32 +269,17 @@ func newBridge(
 		firstStart:  firstStart,
 		lastVersion: lastVersion,
-		tasks:       tasks,
+		tasks: tasks,
-		syncService: syncservice.NewService(reporter, panicHandler),
+
 		uidValidityGenerator: uidValidityGenerator,
 		serverManager: newServerManager(),
 	}
-	bridge.serverManager = imapsmtpserver.NewService(context.Background(),
+	if err := bridge.serverManager.Init(bridge); err != nil {
 		&bridgeSMTPSettings{b: bridge},
 		&bridgeIMAPSettings{b: bridge},
 		&bridgeEventPublisher{b: bridge},
 		panicHandler,
 		reporter,
 		uidValidityGenerator,
 		&bridgeIMAPSMTPTelemetry{b: bridge},
 	)
 	if err := bridge.serverManager.Init(context.Background(), bridge.tasks, &bridgeEventSubscription{b: bridge}); err != nil {
 		return nil, err
 	}
 	if heartbeatManager == nil {
 		bridge.heartbeat.init(bridge, bridge)
 	} else {
 		bridge.heartbeat.init(bridge, heartbeatManager)
 	}
 	bridge.syncService.Run()
 	return bridge, nil
 }
@ -324,7 +293,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// Handle connection up/down events.
 	bridge.api.AddStatusObserver(func(status proton.Status) {
-		logPkg.Info("API status changed: ", status)
+		logrus.Info("API status changed: ", status)
 		switch {
 		case status == proton.StatusUp:
@ -339,7 +308,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// If any call returns a bad version code, we need to update.
 	bridge.api.AddErrorHandler(proton.AppVersionBadCode, func() {
-		logPkg.Warn("App version is bad")
+		logrus.Warn("App version is bad")
 		bridge.publish(events.UpdateForced{})
 	})
@ -352,7 +321,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// Log all manager API requests (client requests are logged separately).
 	bridge.api.AddPostRequestHook(func(_ *resty.Client, r *resty.Response) error {
 		if _, ok := proton.ClientIDFromContext(r.Request.Context()); !ok {
-			logrus.WithField("pkg", "gpa/manager").Infof("%v: %v %v", r.Status(), r.Request.Method, r.Request.URL)
+			logrus.Infof("[MANAGER] %v: %v %v", r.Status(), r.Request.Method, r.Request.URL)
 		}
 		return nil
@ -361,7 +330,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// Publish a TLS issue event if a TLS issue is encountered.
 	bridge.tasks.Once(func(ctx context.Context) {
 		async.RangeContext(ctx, tlsReporter.GetTLSIssueCh(), func(struct{}) {
-			logPkg.Warn("TLS issue encountered")
+			logrus.Warn("TLS issue encountered")
 			bridge.publish(events.TLSIssue{})
 		})
 	})
@ -369,7 +338,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// Publish a raise event if the focus service is called.
 	bridge.tasks.Once(func(ctx context.Context) {
 		async.RangeContext(ctx, bridge.focusService.GetRaiseCh(), func(struct{}) {
-			logPkg.Info("Focus service requested raise")
+			logrus.Info("Focus service requested raise")
 			bridge.publish(events.Raise{})
 		})
 	})
@ -377,7 +346,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// Handle any IMAP events that are forwarded to the bridge from gluon.
 	bridge.tasks.Once(func(ctx context.Context) {
 		async.RangeContext(ctx, bridge.imapEventCh, func(event imapEvents.Event) {
-			logPkg.WithField("event", fmt.Sprintf("%T", event)).Debug("Received IMAP event")
+			logrus.WithField("event", fmt.Sprintf("%T", event)).Debug("Received IMAP event")
 			bridge.handleIMAPEvent(event)
 		})
 	})
@ -385,7 +354,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// Attempt to load users from the vault when triggered.
 	bridge.goLoad = bridge.tasks.Trigger(func(ctx context.Context) {
 		if err := bridge.loadUsers(ctx); err != nil {
-			logPkg.WithError(err).Error("Failed to load users")
+			logrus.WithError(err).Error("Failed to load users")
 			if netErr := new(proton.NetError); !errors.As(err, &netErr) {
 				sentry.ReportError(bridge.reporter, "Failed to load users", err)
 			}
@ -398,7 +367,7 @@ func (bridge *Bridge) init(tlsReporter TLSReporter) error {
 	// Check for updates when triggered.
 	bridge.goUpdate = bridge.tasks.PeriodicOrTrigger(constants.UpdateCheckInterval, 0, func(ctx context.Context) {
-		logPkg.Info("Checking for updates")
+		logrus.Info("Checking for updates")
 		version, err := bridge.updater.GetVersionInfo(ctx, bridge.api, bridge.vault.GetUpdateChannel())
 		if err != nil {
@ -436,10 +405,12 @@ func (bridge *Bridge) GetErrors() []error {
 }
 func (bridge *Bridge) Close(ctx context.Context) {
-	logPkg.Info("Closing bridge")
+	logrus.Info("Closing bridge")
-	// Stop heart beat before closing users.
+	// Close the servers
-	bridge.heartbeat.stop()
+	if err := bridge.serverManager.CloseServers(ctx); err != nil {
 		logrus.WithError(err).Error("Failed to close servers")
 	}
 	// Close all users.
 	safe.Lock(func() {
@ -448,13 +419,6 @@ func (bridge *Bridge) Close(ctx context.Context) {
 		}
 	}, bridge.usersLock)
 	// Close the servers
 	if err := bridge.serverManager.CloseServers(ctx); err != nil {
 		logPkg.WithError(err).Error("Failed to close servers")
 	}
 	bridge.syncService.Close()
 	// Stop all ongoing tasks.
 	bridge.tasks.CancelAndWait()
@ -476,12 +440,12 @@ func (bridge *Bridge) publish(event events.Event) {
 	bridge.watchersLock.RLock()
 	defer bridge.watchersLock.RUnlock()
-	logPkg.WithField("event", event).Debug("Publishing event")
+	logrus.WithField("event", event).Debug("Publishing event")
 	for _, watcher := range bridge.watchers {
 		if watcher.IsWatching(event) {
 			if ok := watcher.Send(event); !ok {
-				logPkg.WithField("event", event).Warn("Failed to send event to watcher")
+				logrus.WithField("event", event).Warn("Failed to send event to watcher")
 			}
 		}
 	}
@ -513,14 +477,26 @@ func (bridge *Bridge) remWatcher(watcher *watcher.Watcher[events.Event]) {
 	watcher.Close()
 }
-func (bridge *Bridge) onStatusUp(_ context.Context) {
+func (bridge *Bridge) onStatusUp(ctx context.Context) {
-	logPkg.Info("Handling API status up")
+	logrus.Info("Handling API status up")
 	safe.RLock(func() {
 		for _, user := range bridge.users {
 			user.OnStatusUp(ctx)
 		}
 	}, bridge.usersLock)
 	bridge.goLoad()
 }
 func (bridge *Bridge) onStatusDown(ctx context.Context) {
-	logPkg.Info("Handling API status down")
+	logrus.Info("Handling API status down")
 	safe.RLock(func() {
 		for _, user := range bridge.users {
 			user.OnStatusDown(ctx)
 		}
 	}, bridge.usersLock)
 	for backoff := time.Second; ; backoff = min(backoff*2, 30*time.Second) {
 		select {
@ -528,10 +504,10 @@ func (bridge *Bridge) onStatusDown(ctx context.Context) {
 			return
 		case <-time.After(backoff):
-			logPkg.Info("Pinging API")
+			logrus.Info("Pinging API")
 			if err := bridge.api.Ping(ctx); err != nil {
-				logPkg.WithError(err).Warn("Ping failed, API is still unreachable")
+				logrus.WithError(err).Warn("Ping failed, API is still unreachable")
 			} else {
 				return
 			}
@ -539,49 +515,6 @@ func (bridge *Bridge) onStatusDown(ctx context.Context) {
 	}
 }
 func (bridge *Bridge) Repair() {
 	var wg sync.WaitGroup
 	userIDS := bridge.GetUserIDs()
 	for _, userID := range userIDS {
 		logPkg.Info("Initiating repair for userID:", userID)
 		userInfo, err := bridge.GetUserInfo(userID)
 		if err != nil {
 			logPkg.WithError(err).Error("Failed getting user info for repair; ID:", userID)
 			continue
 		}
 		if userInfo.State != Connected {
 			logPkg.Info("User is not connected. Repair will be executed on following successful log in.", userID)
 			if err := bridge.vault.GetUser(userID, func(user *vault.User) {
 				if err := user.SetShouldSync(true); err != nil {
 					logPkg.WithError(err).Error("Failed setting vault should sync for user:", userID)
 				}
 			}); err != nil {
 				logPkg.WithError(err).Error("Unable to get user vault when scheduling repair:", userID)
 			}
 			continue
 		}
 		bridgeUser, ok := bridge.users[userID]
 		if !ok {
 			logPkg.Info("UserID does not exist in bridge user map", userID)
 			continue
 		}
 		wg.Add(1)
 		go func(userID string) {
 			defer wg.Done()
 			if err = bridgeUser.TriggerRepair(); err != nil {
 				logPkg.WithError(err).Error("Failed re-syncing IMAP for userID", userID)
 			}
 		}(userID)
 	}
 	wg.Wait()
 }
 func loadTLSConfig(vault *vault.Vault) (*tls.Config, error) {
 	cert, err := tls.X509KeyPair(vault.GetBridgeTLSCert())
 	if err != nil {
@ -594,6 +527,24 @@ func loadTLSConfig(vault *vault.Vault) (*tls.Config, error) {
 	}, nil
 }
 func newListener(port int, useTLS bool, tlsConfig *tls.Config) (net.Listener, error) {
 	if useTLS {
 		tlsListener, err := tls.Listen("tcp", fmt.Sprintf("%v:%v", constants.Host, port), tlsConfig)
 		if err != nil {
 			return nil, err
 		}
 		return tlsListener, nil
 	}
 	netListener, err := net.Listen("tcp", fmt.Sprintf("%v:%v", constants.Host, port))
 	if err != nil {
 		return nil, err
 	}
 	return netListener, nil
 }
 func min(a, b time.Duration) time.Duration {
 	if a < b {
 		return a
@ -601,7 +552,3 @@ func min(a, b time.Duration) time.Duration {
 	return b
 }
 func (bridge *Bridge) HasAPIConnection() bool {
 	return bridge.api.GetStatus() == proton.StatusUp
 }
--- a/internal/bridge/bridge_test.go
+++ b/internal/bridge/bridge_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -44,19 +44,16 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/ProtonMail/proton-bridge/v3/internal/focus"
 	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
 	"github.com/ProtonMail/proton-bridge/v3/internal/services/imapsmtpserver"
 	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 	"github.com/ProtonMail/proton-bridge/v3/internal/user"
 	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/ProtonMail/proton-bridge/v3/tests"
 	"github.com/bradenaw/juniper/xslices"
 	imapid "github.com/emersion/go-imap-id"
 	"github.com/emersion/go-sasl"
 	"github.com/emersion/go-smtp"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 )
 var (
@ -184,11 +181,20 @@ func TestBridge_UserAgent_Persistence(t *testing.T) {
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(b)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(b)
 			defer smtpWaiter.Done()
 			currentUserAgent := b.GetCurrentUserAgent()
 			require.Contains(t, currentUserAgent, useragent.DefaultUserAgent)
 			require.NoError(t, getErr(b.LoginFull(ctx, otherUser, otherPassword, nil, nil)))
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, b.GetIMAPPort()))
 			require.NoError(t, err)
 			defer func() { _ = imapClient.Logout() }()
@ -226,12 +232,21 @@ func TestBridge_UserAgentFromUnknownClient(t *testing.T) {
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(b)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(b)
 			defer smtpWaiter.Done()
 			currentUserAgent := b.GetCurrentUserAgent()
 			require.Contains(t, currentUserAgent, useragent.DefaultUserAgent)
 			userID, err := b.LoginFull(context.Background(), username, password, nil, nil)
 			require.NoError(t, err)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, b.GetIMAPPort()))
 			require.NoError(t, err)
 			defer func() { _ = imapClient.Logout() }()
@ -256,12 +271,21 @@ func TestBridge_UserAgentFromSMTPClient(t *testing.T) {
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(b)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(b)
 			defer smtpWaiter.Done()
 			currentUserAgent := b.GetCurrentUserAgent()
 			require.Contains(t, currentUserAgent, useragent.DefaultUserAgent)
 			userID, err := b.LoginFull(context.Background(), username, password, nil, nil)
 			require.NoError(t, err)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			client, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(b.GetSMTPPort())))
 			require.NoError(t, err)
 			defer client.Close() //nolint:errcheck
@ -306,8 +330,17 @@ func TestBridge_UserAgentFromIMAPID(t *testing.T) {
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(b)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(b)
 			defer smtpWaiter.Done()
 			require.NoError(t, getErr(b.LoginFull(ctx, otherUser, otherPassword, nil, nil)))
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, b.GetIMAPPort()))
 			require.NoError(t, err)
 			defer func() { _ = imapClient.Logout() }()
@ -550,7 +583,7 @@ func TestBridge_MissingGluonStore(t *testing.T) {
 		require.NoError(t, os.RemoveAll(gluonDir))
 		// Bridge starts but can't find the gluon store dir; there should be no error.
-		withBridgeWaitForServers(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
+		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			// ...
 		})
 	})
@ -588,10 +621,6 @@ func TestBridge_AddressWithoutKeys(t *testing.T) {
 		defer m.Close()
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			// Watch for sync finished event.
 			syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
 			defer done()
 			// Create a user which will have an address without keys.
 			userID, _, err := s.CreateUser("nokeys", []byte("password"))
 			require.NoError(t, err)
@ -612,6 +641,10 @@ func TestBridge_AddressWithoutKeys(t *testing.T) {
 			// Remove the address keys.
 			require.NoError(t, s.RemoveAddressKey(userID, aliasAddrID, aliasAddr.Keys[0].ID))
 			// Watch for sync finished event.
 			syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
 			defer done()
 			// We should be able to log the user in.
 			require.NoError(t, getErr(bridge.LoginFull(context.Background(), "nokeys", []byte("password"), nil, nil)))
 			require.NoError(t, err)
@ -667,10 +700,10 @@ func TestBridge_InitGluonDirectory(t *testing.T) {
 			configDir, err := b.GetGluonDataDir()
 			require.NoError(t, err)
-			_, err = os.ReadDir(imapsmtpserver.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
+			_, err = os.ReadDir(bridge.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
 			require.False(t, os.IsNotExist(err))
-			_, err = os.ReadDir(imapsmtpserver.ApplyGluonConfigPathSuffix(configDir))
+			_, err = os.ReadDir(bridge.ApplyGluonConfigPathSuffix(configDir))
 			require.False(t, os.IsNotExist(err))
 		})
 	})
@ -679,12 +712,21 @@ func TestBridge_InitGluonDirectory(t *testing.T) {
 func TestBridge_LoginFailed(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, vaultKey []byte) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(bridge)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			failCh, done := chToType[events.Event, events.IMAPLoginFailed](bridge.GetEvents(events.IMAPLoginFailed{}))
 			defer done()
 			_, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			imapClient, err := eventuallyDial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetIMAPPort())))
 			require.NoError(t, err)
@ -712,6 +754,12 @@ func TestBridge_ChangeCacheDirectory(t *testing.T) {
 			configDir, err := b.GetGluonDataDir()
 			require.NoError(t, err)
 			imapWaiter := waitForIMAPServerReady(b)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(b)
 			defer smtpWaiter.Done()
 			// Login the user.
 			syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
 			defer done()
@ -728,16 +776,16 @@ func TestBridge_ChangeCacheDirectory(t *testing.T) {
 			require.NoError(t, err)
 			// Old store should no more exists.
-			_, err = os.ReadDir(imapsmtpserver.ApplyGluonCachePathSuffix(currentCacheDir))
+			_, err = os.ReadDir(bridge.ApplyGluonCachePathSuffix(currentCacheDir))
 			require.True(t, os.IsNotExist(err))
 			// Database should not have changed.
-			_, err = os.ReadDir(imapsmtpserver.ApplyGluonConfigPathSuffix(configDir))
+			_, err = os.ReadDir(bridge.ApplyGluonConfigPathSuffix(configDir))
 			require.False(t, os.IsNotExist(err))
 			// New path should have Gluon sub-folder.
 			require.Equal(t, filepath.Join(newCacheDir, "gluon"), b.GetGluonCacheDir())
 			// And store should be inside it.
-			_, err = os.ReadDir(imapsmtpserver.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
+			_, err = os.ReadDir(bridge.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
 			require.False(t, os.IsNotExist(err))
 			// We should be able to fetch.
@ -745,6 +793,9 @@ func TestBridge_ChangeCacheDirectory(t *testing.T) {
 			require.NoError(t, err)
 			require.True(t, info.State == bridge.Connected)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			client, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, b.GetIMAPPort()))
 			require.NoError(t, err)
 			require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
@ -822,9 +873,6 @@ func TestBridge_ChangeAddressOrder(t *testing.T) {
 // withEnv creates the full test environment and runs the tests.
 func withEnv(t *testing.T, tests func(context.Context, *server.Server, *proton.NetCtl, bridge.Locator, []byte), opts ...server.Option) {
 	opt := goleak.IgnoreCurrent()
 	defer goleak.VerifyNone(t, opt)
 	server := server.New(opts...)
 	defer server.Close()
@ -897,7 +945,6 @@ func withBridgeNoMocks(
 		mocks.Autostarter,
 		mocks.Updater,
 		v2_3_0,
 		keychain.NewTestKeychainsList(),
 		// The API stuff.
 		apiURL,
@ -909,7 +956,6 @@ func withBridgeNoMocks(
 		mocks.CrashHandler,
 		mocks.Reporter,
 		testUIDValidityGenerator,
 		mocks.Heartbeat,
 		// The logging stuff.
 		os.Getenv("BRIDGE_LOG_IMAP_CLIENT") == "1",
@ -919,6 +965,9 @@ func withBridgeNoMocks(
 	require.NoError(t, err)
 	require.Empty(t, bridge.GetErrors())
 	// Start the Heartbeat process.
 	bridge.StartHeartbeat(mocks.Heartbeat)
 	// Wait for bridge to finish loading users.
 	waitForEvent(t, eventCh, events.AllUsersLoaded{})
@ -1008,7 +1057,6 @@ func getConnectedUserIDs(t *testing.T, b *bridge.Bridge) []string {
 func chToType[In, Out any](inCh <-chan In, done func()) (<-chan Out, func()) {
 	outCh := make(chan Out)
 	ctx, cancel := context.WithCancel(context.Background())
 	go func() {
 		defer close(outCh)
@ -1018,19 +1066,11 @@ func chToType[In, Out any](inCh <-chan In, done func()) (<-chan Out, func()) {
 				panic(fmt.Sprintf("unexpected type %T", in))
 			}
-			select {
+			outCh <- out
 			case <-ctx.Done():
 				return
 			case outCh <- out:
 			}
 		}
 	}()
-	return outCh, func() {
+	return outCh, done
 		cancel()
 		done()
 	}
 }
 type eventWaiter struct {
--- a/internal/bridge/bug_report.go
+++ b/internal/bridge/bug_report.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -19,7 +19,6 @@ package bridge
 import (
 	"context"
 	"errors"
 	"io"
 	"github.com/ProtonMail/go-proton-api"
@ -34,133 +33,63 @@ const (
 	DefaultMaxSessionCountForBugReport = 10
 )
-type ReportBugReq struct {
+func (bridge *Bridge) ReportBug(ctx context.Context, osType, osVersion, description, username, email, client string, attachLogs bool) error {
-	OSType      string
+	var account string
 	OSVersion   string
 	Title       string
 	Description string
 	Username    string
 	Email       string
 	EmailClient string
 	IncludeLogs bool
 }
-func (bridge *Bridge) ReportBug(ctx context.Context, report *ReportBugReq) error {
+	if info, err := bridge.QueryUserInfo(username); err == nil {
-	if info, err := bridge.QueryUserInfo(report.Username); err == nil {
+		account = info.Username
 		report.Username = info.Username
 	} else if userIDs := bridge.GetUserIDs(); len(userIDs) > 0 {
 		if err := bridge.vault.GetUser(userIDs[0], func(user *vault.User) {
-			report.Username = user.Username()
+			account = user.Username()
 		}); err != nil {
 			return err
 		}
 	}
-	var attachments []proton.ReportBugAttachment
+	var attachment []proton.ReportBugAttachment
-	if report.IncludeLogs {
+
-		logs, err := bridge.CollectLogs()
+	if attachLogs {
 		logsPath, err := bridge.locator.ProvideLogsPath()
 		if err != nil {
 			return err
 		}
-		attachments = append(attachments, logs)
+
 		buffer, err := logging.ZipLogsForBugReport(logsPath, DefaultMaxSessionCountForBugReport, DefaultMaxBugReportZipSize)
 		if err != nil {
 			return err
 		}
 		body, err := io.ReadAll(buffer)
 		if err != nil {
 			return err
 		}
 		attachment = append(attachment, proton.ReportBugAttachment{
 			Name:     "logs.zip",
 			Filename: "logs.zip",
 			MIMEType: "application/zip",
 			Body:     body,
 		})
 	}
-	var firstAtt proton.ReportBugAttachment
+	safe.Lock(func() {
 	if len(attachments) > 0 && report.IncludeLogs {
 		firstAtt = attachments[0]
 	}
 	attachmentType := proton.AttachmentTypeSync
 	if len(attachments) > 1 {
 		attachmentType = proton.AttachmentTypeAsync
 	}
 	token, err := bridge.createTicket(ctx, report, attachmentType, firstAtt)
 	if err != nil || token == "" {
 		return err
 	}
 	safe.RLock(func() {
 		for _, user := range bridge.users {
 			user.ReportBugSent()
 		}
 	}, bridge.usersLock)
-	// if we have a token we can append more attachment to the bugReport
+	return bridge.api.ReportBug(ctx, proton.ReportBugReq{
-	for i, att := range attachments {
+		OS:        osType,
-		if i == 0 && report.IncludeLogs {
+		OSVersion: osVersion,
 			continue
 		}
 		err := bridge.appendComment(ctx, token, att)
 		if err != nil {
 			return err
 		}
 	}
 	return err
 }
-func (bridge *Bridge) CollectLogs() (proton.ReportBugAttachment, error) {
+		Title:       "[Bridge] Bug",
-	logsPath, err := bridge.locator.ProvideLogsPath()
+		Description: description,
 	if err != nil {
 		return proton.ReportBugAttachment{}, err
 	}
-	buffer, err := logging.ZipLogsForBugReport(logsPath, DefaultMaxSessionCountForBugReport, DefaultMaxBugReportZipSize)
+		Client:        client,
 	if err != nil {
 		return proton.ReportBugAttachment{}, err
 	}
 	body, err := io.ReadAll(buffer)
 	if err != nil {
 		return proton.ReportBugAttachment{}, err
 	}
 	return proton.ReportBugAttachment{
 		Name:     "logs.zip",
 		Filename: "logs.zip",
 		MIMEType: "application/zip",
 		Body:     body,
 	}, nil
 }
 func (bridge *Bridge) createTicket(ctx context.Context, report *ReportBugReq,
 	asyncAttach proton.AttachmentType, att proton.ReportBugAttachment) (string, error) {
 	var attachments []proton.ReportBugAttachment
 	attachments = append(attachments, att)
 	res, err := bridge.api.ReportBug(ctx, proton.ReportBugReq{
 		OS:        report.OSType,
 		OSVersion: report.OSVersion,
 		Title:       "[Bridge] Bug - " + report.Title,
 		Description: report.Description,
 		Client:        report.EmailClient,
 		ClientType:    proton.ClientTypeEmail,
 		ClientVersion: constants.AppVersion(bridge.curVersion.Original()),
-		Username: report.Username,
+		Username: account,
-		Email:    report.Email,
+		Email:    email,
-
+	}, attachment...)
 		AsyncAttachments: asyncAttach,
 	}, attachments...)
 	if err != nil || asyncAttach != proton.AttachmentTypeAsync {
 		return "", err
 	}
 	if asyncAttach == proton.AttachmentTypeAsync && res.Token == nil {
 		return "", errors.New("no token returns for AsyncAttachments")
 	}
 	return *res.Token, nil
 }
 func (bridge *Bridge) appendComment(ctx context.Context, token string, att proton.ReportBugAttachment) error {
 	var attachments []proton.ReportBugAttachment
 	attachments = append(attachments, att)
 	return bridge.api.ReportBugAttachement(ctx, proton.ReportBugAttachmentReq{
 		Product: proton.ClientTypeEmail,
 		Body:    "Comment adding attachment: " + att.Filename,
 		Token:   token,
 	}, attachments...)
 }
--- a/internal/bridge/config_status.go
+++ b/internal/bridge/config_status.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -22,7 +22,7 @@ import (
 )
 func (bridge *Bridge) ReportBugClicked() {
-	safe.RLock(func() {
+	safe.Lock(func() {
 		for _, user := range bridge.users {
 			user.ReportBugClicked()
 		}
@ -30,17 +30,17 @@ func (bridge *Bridge) ReportBugClicked() {
 }
 func (bridge *Bridge) AutoconfigUsed(client string) {
-	safe.RLock(func() {
+	safe.Lock(func() {
 		for _, user := range bridge.users {
 			user.AutoconfigUsed(client)
 		}
 	}, bridge.usersLock)
 }
-func (bridge *Bridge) ExternalLinkClicked(article string) {
+func (bridge *Bridge) KBArticleOpened(article string) {
-	safe.RLock(func() {
+	safe.Lock(func() {
 		for _, user := range bridge.users {
-			user.ExternalLinkClicked(article)
+			user.KBArticleOpened(article)
 		}
 	}, bridge.usersLock)
 }
--- a/internal/bridge/configure.go
+++ b/internal/bridge/configure.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -19,7 +19,6 @@ package bridge
 import (
 	"context"
 	"errors"
 	"strings"
 	"github.com/ProtonMail/proton-bridge/v3/internal/clientconfig"
@ -31,10 +30,10 @@ import (
 	"github.com/sirupsen/logrus"
 )
-// ConfigureAppleMail configures Apple Mail for the given userID and address.
+// ConfigureAppleMail configures apple mail for the given userID and address.
-// If configuring Apple Mail for Catalina or newer, it ensures Bridge is using SSL.
+// If configuring apple mail for Catalina or newer, it ensures Bridge is using SSL.
 func (bridge *Bridge) ConfigureAppleMail(ctx context.Context, userID, address string) error {
-	logPkg.WithFields(logrus.Fields{
+	logrus.WithFields(logrus.Fields{
 		"userID":  userID,
 		"address": logging.Sensitive(address),
 	}).Info("Configuring Apple Mail")
@ -45,28 +44,16 @@ func (bridge *Bridge) ConfigureAppleMail(ctx context.Context, userID, address st
 			return ErrNoSuchUser
 		}
 		emails := user.Emails()
 		displayNames := user.DisplayNames()
 		if (len(emails) == 0) || (len(displayNames) == 0) {
 			return errors.New("could not retrieve user address info")
 		}
 		if address == "" {
-			address = emails[0]
+			address = user.Emails()[0]
 		}
-		var username, displayName, addresses string
+		username := address
 		addresses := address
 		if user.GetAddressMode() == vault.CombinedMode {
-			username = address
+			username = user.Emails()[0]
-			displayName = displayNames[username]
+			addresses = strings.Join(user.Emails(), ",")
 			addresses = strings.Join(emails, ",")
 		} else {
 			username = address
 			addresses = address
 			displayName = displayNames[address]
 			if len(displayName) == 0 {
 				displayName = address
 			}
 		}
 		if useragent.IsCatalinaOrNewer() && !bridge.vault.GetSMTPSSL() {
@ -82,7 +69,6 @@ func (bridge *Bridge) ConfigureAppleMail(ctx context.Context, userID, address st
 			bridge.vault.GetIMAPSSL(),
 			bridge.vault.GetSMTPSSL(),
 			username,
 			displayName,
 			addresses,
 			user.BridgePass(),
 		)
--- a/internal/bridge/debug.go
+++ b/internal/bridge/debug.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -65,11 +65,7 @@ func (bridge *Bridge) CheckClientState(ctx context.Context, checkFlags bool, pro
 		if progressCB != nil {
 			progressCB(fmt.Sprintf("Checking state for user %v", usr.Name()))
 		}
-		log := logrus.WithFields(logrus.Fields{
+		log := logrus.WithField("user", usr.Name()).WithField("diag", "state-check")
 			"pkg":  "bridge/debug",
 			"user": usr.Name(),
 			"diag": "state-check",
 		})
 		log.Debug("Retrieving all server metadata")
 		meta, err := usr.GetDiagnosticMetadata(ctx)
 		if err != nil {
@ -83,7 +79,7 @@ func (bridge *Bridge) CheckClientState(ctx context.Context, checkFlags bool, pro
 		}
 		log.Debug("Building state")
-		state, err := meta.BuildMailboxToMessageMap(ctx, usr)
+		state, err := meta.BuildMailboxToMessageMap(usr)
 		if err != nil {
 			log.WithError(err).Error("Failed to build state")
 			return result, err
@ -284,7 +280,7 @@ func clientGetMessageIDs(client *goimapclient.Client, mailbox string) (map[strin
 		internalID, ok := header.GetChecked("X-Pm-Internal-Id")
 		if !ok {
-			logrus.WithField("pkg", "bridge/debug").Errorf("Message %v does not have internal id", internalID)
+			logrus.Errorf("Message %v does not have internal id", internalID)
 			continue
 		}
--- a/internal/bridge/draft_test.go
+++ b/internal/bridge/draft_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -64,6 +64,9 @@ func TestBridge_HandleDraftsSendFromOtherClient(t *testing.T) {
 		// The initial user should be fully synced.
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, _ *bridge.Mocks) {
 			waiter := waitForIMAPServerReady(b)
 			defer waiter.Done()
 			syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
 			defer done()
@ -71,6 +74,7 @@ func TestBridge_HandleDraftsSendFromOtherClient(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, userID, (<-syncCh).UserID)
 			waiter.Wait()
 			info, err := b.GetUserInfo(userID)
 			require.NoError(t, err)
--- a/internal/bridge/errors.go
+++ b/internal/bridge/errors.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/bridge/events.go
+++ b/internal/bridge/events.go
@ -1,45 +0,0 @@
 // Copyright (c) 2024 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
 // Proton Mail 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.
 //
 // Proton Mail 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 Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 package bridge
 import (
 	"context"
 	"github.com/ProtonMail/gluon/watcher"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 )
 type bridgeEventSubscription struct {
 	b *Bridge
 }
 func (b bridgeEventSubscription) Add(ofType ...events.Event) *watcher.Watcher[events.Event] {
 	return b.b.addWatcher(ofType...)
 }
 func (b bridgeEventSubscription) Remove(watcher *watcher.Watcher[events.Event]) {
 	b.b.remWatcher(watcher)
 }
 type bridgeEventPublisher struct {
 	b *Bridge
 }
 func (b bridgeEventPublisher) PublishEvent(_ context.Context, event events.Event) {
 	b.b.publish(event)
 }
--- a/internal/bridge/files.go
+++ b/internal/bridge/files.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-package files
+package bridge
 import (
 	"fmt"
@ -24,7 +24,7 @@ import (
 	"path/filepath"
 )
-func MoveDir(from, to string) error {
+func moveDir(from, to string) error {
 	entries, err := os.ReadDir(from)
 	if err != nil {
 		return err
@ -36,7 +36,7 @@ func MoveDir(from, to string) error {
 				return err
 			}
-			if err := MoveDir(filepath.Join(from, entry.Name()), filepath.Join(to, entry.Name())); err != nil {
+			if err := moveDir(filepath.Join(from, entry.Name()), filepath.Join(to, entry.Name())); err != nil {
 				return err
 			}
@ -61,12 +61,12 @@ func moveFile(from, to string) error {
 	return os.Rename(from, to)
 }
-func CopyDir(from, to string) error {
+func copyDir(from, to string) error {
 	entries, err := os.ReadDir(from)
 	if err != nil {
 		return err
 	}
-	if err := CreateIfNotExists(to, 0o700); err != nil {
+	if err := createIfNotExists(to, 0o700); err != nil {
 		return err
 	}
 	for _, entry := range entries {
@ -74,11 +74,11 @@ func CopyDir(from, to string) error {
 		destPath := filepath.Join(to, entry.Name())
 		if entry.IsDir() {
-			if err := CopyDir(sourcePath, destPath); err != nil {
+			if err := copyDir(sourcePath, destPath); err != nil {
 				return err
 			}
 		} else {
-			if err := CopyFile(sourcePath, destPath); err != nil {
+			if err := copyFile(sourcePath, destPath); err != nil {
 				return err
 			}
 		}
@ -86,7 +86,7 @@ func CopyDir(from, to string) error {
 	return nil
 }
-func CopyFile(srcFile, dstFile string) error {
+func copyFile(srcFile, dstFile string) error {
 	out, err := os.Create(filepath.Clean(dstFile))
 	defer func(out *os.File) {
 		_ = out.Close()
@ -113,7 +113,7 @@ func CopyFile(srcFile, dstFile string) error {
 	return nil
 }
-func Exists(filePath string) bool {
+func exists(filePath string) bool {
 	if _, err := os.Stat(filePath); os.IsNotExist(err) {
 		return false
 	}
@ -121,8 +121,8 @@ func Exists(filePath string) bool {
 	return true
 }
-func CreateIfNotExists(dir string, perm os.FileMode) error {
+func createIfNotExists(dir string, perm os.FileMode) error {
-	if Exists(dir) {
+	if exists(dir) {
 		return nil
 	}
--- a/internal/bridge/files_test.go
+++ b/internal/bridge/files_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-package files
+package bridge
 import (
 	"os"
@ -41,7 +41,7 @@ func TestMoveDir(t *testing.T) {
 	}
 	// Move the files.
-	if err := MoveDir(from, to); err != nil {
+	if err := moveDir(from, to); err != nil {
 		t.Fatal(err)
 	}
--- a/internal/bridge/heartbeat.go
+++ b/internal/bridge/heartbeat.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -20,100 +20,18 @@ package bridge
 import (
 	"context"
 	"encoding/json"
 	"sync"
 	"time"
 	"github.com/ProtonMail/gluon/async"
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v3/internal/telemetry"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/sirupsen/logrus"
 )
 const HeartbeatCheckInterval = time.Hour
 type heartBeatState struct {
 	task *async.Group
 	telemetry.Heartbeat
 	taskLock     sync.Mutex
 	taskStarted  bool
 	taskInterval time.Duration
 }
 func newHeartBeatState(ctx context.Context, panicHandler async.PanicHandler) *heartBeatState {
 	return &heartBeatState{
 		task: async.NewGroup(ctx, panicHandler),
 	}
 }
 func (h *heartBeatState) init(bridge *Bridge, manager telemetry.HeartbeatManager) {
 	h.Heartbeat = telemetry.NewHeartbeat(manager, 1143, 1025, bridge.GetGluonCacheDir(), bridge.keychains.GetDefaultHelper())
 	h.taskInterval = manager.GetHeartbeatPeriodicInterval()
 	h.SetRollout(bridge.GetUpdateRollout())
 	h.SetAutoStart(bridge.GetAutostart())
 	h.SetAutoUpdate(bridge.GetAutoUpdate())
 	h.SetBeta(bridge.GetUpdateChannel())
 	h.SetDoh(bridge.GetProxyAllowed())
 	h.SetShowAllMail(bridge.GetShowAllMail())
 	h.SetIMAPConnectionMode(bridge.GetIMAPSSL())
 	h.SetSMTPConnectionMode(bridge.GetSMTPSSL())
 	h.SetIMAPPort(bridge.GetIMAPPort())
 	h.SetSMTPPort(bridge.GetSMTPPort())
 	h.SetCacheLocation(bridge.GetGluonCacheDir())
 	if val, err := bridge.GetKeychainApp(); err != nil {
 		h.SetKeyChainPref(val)
 	} else {
 		h.SetKeyChainPref(bridge.keychains.GetDefaultHelper())
 	}
 	h.SetPrevVersion(bridge.GetLastVersion().String())
 	safe.RLock(func() {
 		var splitMode = false
 		for _, user := range bridge.users {
 			if user.GetAddressMode() == vault.SplitMode {
 				splitMode = true
 				break
 			}
 		}
 		var nbAccount = len(bridge.users)
 		h.SetNbAccount(nbAccount)
 		h.SetSplitMode(splitMode)
 		// Do not try to send if there is no user yet.
 		if nbAccount > 0 {
 			defer h.start()
 		}
 	}, bridge.usersLock)
 }
 func (h *heartBeatState) start() {
 	h.taskLock.Lock()
 	defer h.taskLock.Unlock()
 	if h.taskStarted {
 		return
 	}
 	h.taskStarted = true
 	h.task.PeriodicOrTrigger(h.taskInterval, 0, func(ctx context.Context) {
 		logrus.WithField("pkg", "bridge/heartbeat").Debug("Checking for heartbeat")
 		h.TrySending(ctx)
 	})
 }
 func (h *heartBeatState) stop() {
 	h.taskLock.Lock()
 	defer h.taskLock.Unlock()
 	if !h.taskStarted {
 		return
 	}
 	h.task.CancelAndWait()
 	h.taskStarted = false
 }
 func (bridge *Bridge) IsTelemetryAvailable(ctx context.Context) bool {
 	var flag = true
 	if bridge.GetTelemetryDisabled() {
@ -135,7 +53,7 @@ func (bridge *Bridge) SendHeartbeat(ctx context.Context, heartbeat *telemetry.He
 		if err := bridge.reporter.ReportMessageWithContext("Cannot parse heartbeat data.", reporter.Context{
 			"error": err,
 		}); err != nil {
-			logrus.WithField("pkg", "bridge/heartbeat").WithError(err).Error("Failed to parse heartbeat data.")
+			logrus.WithError(err).Error("Failed to parse heartbeat data.")
 		}
 		return false
 	}
@ -162,6 +80,49 @@ func (bridge *Bridge) SetLastHeartbeatSent(timestamp time.Time) error {
 	return bridge.vault.SetLastHeartbeatSent(timestamp)
 }
-func (bridge *Bridge) GetHeartbeatPeriodicInterval() time.Duration {
+func (bridge *Bridge) StartHeartbeat(manager telemetry.HeartbeatManager) {
-	return HeartbeatCheckInterval
+	bridge.heartbeat = telemetry.NewHeartbeat(manager, 1143, 1025, bridge.GetGluonCacheDir(), keychain.DefaultHelper)
 	// Check for heartbeat when triggered.
 	bridge.goHeartbeat = bridge.tasks.PeriodicOrTrigger(HeartbeatCheckInterval, 0, func(ctx context.Context) {
 		logrus.Debug("Checking for heartbeat")
 		bridge.heartbeat.TrySending(ctx)
 	})
 	bridge.heartbeat.SetRollout(bridge.GetUpdateRollout())
 	bridge.heartbeat.SetAutoStart(bridge.GetAutostart())
 	bridge.heartbeat.SetAutoUpdate(bridge.GetAutoUpdate())
 	bridge.heartbeat.SetBeta(bridge.GetUpdateChannel())
 	bridge.heartbeat.SetDoh(bridge.GetProxyAllowed())
 	bridge.heartbeat.SetShowAllMail(bridge.GetShowAllMail())
 	bridge.heartbeat.SetIMAPConnectionMode(bridge.GetIMAPSSL())
 	bridge.heartbeat.SetSMTPConnectionMode(bridge.GetSMTPSSL())
 	bridge.heartbeat.SetIMAPPort(bridge.GetIMAPPort())
 	bridge.heartbeat.SetSMTPPort(bridge.GetSMTPPort())
 	bridge.heartbeat.SetCacheLocation(bridge.GetGluonCacheDir())
 	if val, err := bridge.GetKeychainApp(); err != nil {
 		bridge.heartbeat.SetKeyChainPref(val)
 	} else {
 		bridge.heartbeat.SetKeyChainPref(keychain.DefaultHelper)
 	}
 	bridge.heartbeat.SetPrevVersion(bridge.GetLastVersion().String())
 	safe.RLock(func() {
 		var splitMode = false
 		for _, user := range bridge.users {
 			if user.GetAddressMode() == vault.SplitMode {
 				splitMode = true
 				break
 			}
 		}
 		var nbAccount = len(bridge.users)
 		bridge.heartbeat.SetNbAccount(nbAccount)
 		bridge.heartbeat.SetSplitMode(splitMode)
 		// Do not try to send if there is no user yet.
 		if nbAccount > 0 {
 			defer bridge.goHeartbeat()
 		}
 	}, bridge.usersLock)
 }
--- a/internal/bridge/identifier.go
+++ b/internal/bridge/identifier.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -40,35 +40,3 @@ func (bridge *Bridge) setUserAgent(name, version string) {
 		}
 	}
 }
 type bridgeUserAgentUpdater struct {
 	*Bridge
 }
 func (b *bridgeUserAgentUpdater) GetUserAgent() string {
 	return b.identifier.GetUserAgent()
 }
 func (b *bridgeUserAgentUpdater) HasClient() bool {
 	return b.identifier.HasClient()
 }
 func (b *bridgeUserAgentUpdater) SetClient(name, version string) {
 	b.identifier.SetClient(name, version)
 }
 func (b *bridgeUserAgentUpdater) SetPlatform(platform string) {
 	b.identifier.SetPlatform(platform)
 }
 func (b *bridgeUserAgentUpdater) SetClientString(client string) {
 	b.identifier.SetClientString(client)
 }
 func (b *bridgeUserAgentUpdater) GetClientString() string {
 	return b.identifier.GetClientString()
 }
 func (b *bridgeUserAgentUpdater) SetUserAgent(name, version string) {
 	b.setUserAgent(name, version)
 }
--- a/internal/bridge/imap.go
+++ b/internal/bridge/imap.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -20,12 +20,23 @@ package bridge
 import (
 	"context"
 	"crypto/tls"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/gluon"
 	"github.com/ProtonMail/gluon/async"
 	imapEvents "github.com/ProtonMail/gluon/events"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/gluon/store"
 	"github.com/ProtonMail/gluon/store/fallback_v0"
 	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
-	"github.com/ProtonMail/proton-bridge/v3/internal/services/imapsmtpserver"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
 	"github.com/ProtonMail/proton-bridge/v3/internal/user"
 	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	"github.com/sirupsen/logrus"
 )
@ -34,13 +45,21 @@ func (bridge *Bridge) restartIMAP(ctx context.Context) error {
 	return bridge.serverManager.RestartIMAP(ctx)
 }
-func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
+// addIMAPUser connects the given user to gluon.
-	log := logrus.WithField("pkg", "bridge/event/imap")
+func (bridge *Bridge) addIMAPUser(ctx context.Context, user *user.User) error {
 	return bridge.serverManager.AddIMAPUser(ctx, user)
 }
 // removeIMAPUser disconnects the given user from gluon, optionally also removing its files.
 func (bridge *Bridge) removeIMAPUser(ctx context.Context, user *user.User, withData bool) error {
 	return bridge.serverManager.RemoveIMAPUser(ctx, user, withData)
 }
 func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
 	switch event := event.(type) {
 	case imapEvents.UserAdded:
 		for labelID, count := range event.Counts {
-			log.WithFields(logrus.Fields{
+			logrus.WithFields(logrus.Fields{
 				"gluonID": event.UserID,
 				"labelID": labelID,
 				"count":   count,
@ -48,7 +67,7 @@ func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
 		}
 	case imapEvents.IMAPID:
-		log.WithFields(logrus.Fields{
+		logrus.WithFields(logrus.Fields{
 			"sessionID": event.SessionID,
 			"name":      event.IMAPID.Name,
 			"version":   event.IMAPID.Version,
@ -59,7 +78,7 @@ func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
 		}
 	case imapEvents.LoginFailed:
-		log.WithFields(logrus.Fields{
+		logrus.WithFields(logrus.Fields{
 			"sessionID": event.SessionID,
 			"username":  event.Username,
 			"pkg":       "imap",
@ -73,59 +92,108 @@ func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
 	}
 }
-type bridgeIMAPSettings struct {
+func ApplyGluonCachePathSuffix(basePath string) string {
-	b *Bridge
+	return filepath.Join(basePath, "backend", "store")
 }
-func (b *bridgeIMAPSettings) EventPublisher() imapsmtpserver.IMAPEventPublisher {
+func ApplyGluonConfigPathSuffix(basePath string) string {
-	return b
+	return filepath.Join(basePath, "backend", "db")
 }
-func (b *bridgeIMAPSettings) TLSConfig() *tls.Config {
+func newIMAPServer(
-	return b.b.tlsConfig
+	gluonCacheDir, gluonConfigDir string,
-}
+	version *semver.Version,
 	tlsConfig *tls.Config,
 	reporter reporter.Reporter,
 	logClient, logServer bool,
 	eventCh chan<- imapEvents.Event,
 	tasks *async.Group,
 	uidValidityGenerator imap.UIDValidityGenerator,
 	panicHandler async.PanicHandler,
 ) (*gluon.Server, error) {
 	gluonCacheDir = ApplyGluonCachePathSuffix(gluonCacheDir)
 	gluonConfigDir = ApplyGluonConfigPathSuffix(gluonConfigDir)
-func (b *bridgeIMAPSettings) LogClient() bool {
+	logrus.WithFields(logrus.Fields{
-	return b.b.logIMAPClient
+		"gluonStore": gluonCacheDir,
-}
+		"gluonDB":    gluonConfigDir,
 		"version":    version,
 		"logClient":  logClient,
 		"logServer":  logServer,
 	}).Info("Creating IMAP server")
-func (b *bridgeIMAPSettings) LogServer() bool {
+	if logClient || logServer {
-	return b.b.logIMAPServer
+		log := logrus.WithField("protocol", "IMAP")
-}
+		log.Warning("================================================")
-
+		log.Warning("THIS LOG WILL CONTAIN **DECRYPTED** MESSAGE DATA")
-func (b *bridgeIMAPSettings) Port() int {
+		log.Warning("================================================")
 	return b.b.vault.GetIMAPPort()
 }
 func (b *bridgeIMAPSettings) SetPort(i int) error {
 	return b.b.vault.SetIMAPPort(i)
 }
 func (b *bridgeIMAPSettings) UseSSL() bool {
 	return b.b.vault.GetIMAPSSL()
 }
 func (b *bridgeIMAPSettings) CacheDirectory() string {
 	return b.b.GetGluonCacheDir()
 }
 func (b *bridgeIMAPSettings) DataDirectory() (string, error) {
 	return b.b.GetGluonDataDir()
 }
 func (b *bridgeIMAPSettings) SetCacheDirectory(s string) error {
 	return b.b.vault.SetGluonDir(s)
 }
 func (b *bridgeIMAPSettings) Version() *semver.Version {
 	return b.b.curVersion
 }
 func (b *bridgeIMAPSettings) PublishIMAPEvent(ctx context.Context, event imapEvents.Event) {
 	select {
 	case <-ctx.Done():
 		return
 	case b.b.imapEventCh <- event:
 		// do nothing
 	}
 	var imapClientLog io.Writer
 	if logClient {
 		imapClientLog = logging.NewIMAPLogger()
 	} else {
 		imapClientLog = io.Discard
 	}
 	var imapServerLog io.Writer
 	if logServer {
 		imapServerLog = logging.NewIMAPLogger()
 	} else {
 		imapServerLog = io.Discard
 	}
 	imapServer, err := gluon.New(
 		gluon.WithTLS(tlsConfig),
 		gluon.WithDataDir(gluonCacheDir),
 		gluon.WithDatabaseDir(gluonConfigDir),
 		gluon.WithStoreBuilder(new(storeBuilder)),
 		gluon.WithLogger(imapClientLog, imapServerLog),
 		getGluonVersionInfo(version),
 		gluon.WithReporter(reporter),
 		gluon.WithUIDValidityGenerator(uidValidityGenerator),
 		gluon.WithPanicHandler(panicHandler),
 	)
 	if err != nil {
 		return nil, err
 	}
 	tasks.Once(func(ctx context.Context) {
 		async.ForwardContext(ctx, eventCh, imapServer.AddWatcher())
 	})
 	tasks.Once(func(ctx context.Context) {
 		async.RangeContext(ctx, imapServer.GetErrorCh(), func(err error) {
 			logrus.WithError(err).Error("IMAP server error")
 		})
 	})
 	return imapServer, nil
 }
 func getGluonVersionInfo(version *semver.Version) gluon.Option {
 	return gluon.WithVersionInfo(
 		int(version.Major()),
 		int(version.Minor()),
 		int(version.Patch()),
 		constants.FullAppName,
 		"TODO",
 		"TODO",
 	)
 }
 type storeBuilder struct{}
 func (*storeBuilder) New(path, userID string, passphrase []byte) (store.Store, error) {
 	return store.NewOnDiskStore(
 		filepath.Join(path, userID),
 		passphrase,
 		store.WithFallback(fallback_v0.NewOnDiskStoreV0WithCompressor(&fallback_v0.GZipCompressor{})),
 	)
 }
 func (*storeBuilder) Delete(path, userID string) error {
 	return os.RemoveAll(filepath.Join(path, userID))
 }
--- a/internal/bridge/locations.go
+++ b/internal/bridge/locations.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/bridge/main_test.go
+++ b/internal/bridge/main_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/bridge/migration.go
+++ b/internal/bridge/migration.go
@ -0,0 +1,55 @@
 // Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
 // Proton Mail 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.
 //
 // Proton Mail 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 Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 package bridge
 import (
 	"strings"
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 )
 func (bridge *Bridge) databaseResyncNeeded() bool {
 	if strings.HasPrefix(bridge.lastVersion.String(), "3.4.0") &&
 		strings.HasPrefix(bridge.curVersion.String(), "3.4.1") {
 		logrus.WithFields(logrus.Fields{
 			"lastVersion": bridge.lastVersion.String(),
 			"currVersion": bridge.curVersion.String(),
 		}).Warning("Database re-synchronisation needed")
 		return true
 	}
 	return false
 }
 func (bridge *Bridge) migrateUser(vault *vault.User) {
 	if bridge.databaseResyncNeeded() {
 		if err := bridge.reporter.ReportMessage("Database need to be re-sync for migration."); err != nil {
 			logrus.WithError(err).Error("Failed to report database re-sync for migration.")
 		}
 		if err := vault.ClearSyncStatus(); err != nil {
 			logrus.WithError(err).Error("Failed reset to SyncStatus.")
 			if err2 := bridge.reporter.ReportMessageWithContext("Failed to reset SyncStatus for Database migration.",
 				reporter.Context{
 					"error": err,
 				}); err2 != nil {
 				logrus.WithError(err2).Error("Failed to report reset SyncStatus error.")
 			}
 		}
 	}
 }
--- a/internal/bridge/mocks.go
+++ b/internal/bridge/mocks.go
@ -7,7 +7,6 @@ import (
 	"os"
 	"sync"
 	"testing"
 	"time"
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/proton-bridge/v3/internal/bridge/mocks"
@ -52,7 +51,6 @@ func NewMocks(tb testing.TB, version, minAuto *semver.Version) *Mocks {
 	// this is called at start of heartbeat process.
 	mocks.Heartbeat.EXPECT().IsTelemetryAvailable(gomock.Any()).AnyTimes()
 	mocks.Heartbeat.EXPECT().GetHeartbeatPeriodicInterval().AnyTimes().Return(500 * time.Millisecond)
 	return mocks
 }
@ -156,7 +154,3 @@ func (testUpdater *TestUpdater) GetVersionInfo(_ context.Context, _ updater.Down
 func (testUpdater *TestUpdater) InstallUpdate(_ context.Context, _ updater.Downloader, _ updater.VersionInfo) error {
 	return nil
 }
 func (testUpdater *TestUpdater) RemoveOldUpdates() error {
 	return nil
 }
--- a/internal/bridge/mocks/matcher.go
+++ b/internal/bridge/mocks/matcher.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/bridge/mocks/telemetry_mocks.go
+++ b/internal/bridge/mocks/telemetry_mocks.go
@ -36,20 +36,6 @@ func (m *MockHeartbeatManager) EXPECT() *MockHeartbeatManagerMockRecorder {
 	return m.recorder
 }
 // GetHeartbeatPeriodicInterval mocks base method.
 func (m *MockHeartbeatManager) GetHeartbeatPeriodicInterval() time.Duration {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetHeartbeatPeriodicInterval")
 	ret0, _ := ret[0].(time.Duration)
 	return ret0
 }
 // GetHeartbeatPeriodicInterval indicates an expected call of GetHeartbeatPeriodicInterval.
 func (mr *MockHeartbeatManagerMockRecorder) GetHeartbeatPeriodicInterval() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetHeartbeatPeriodicInterval", reflect.TypeOf((*MockHeartbeatManager)(nil).GetHeartbeatPeriodicInterval))
 }
 // GetLastHeartbeatSent mocks base method.
 func (m *MockHeartbeatManager) GetLastHeartbeatSent() time.Time {
 	m.ctrl.T.Helper()
--- a/internal/bridge/refresh_test.go
+++ b/internal/bridge/refresh_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -84,11 +84,6 @@ func TestBridge_Refresh(t *testing.T) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
 			mocks.Reporter.EXPECT().ReportMessageWithContext(gomock.Any(), gomock.Any()).AnyTimes()
 			// Wait for refresh event first
 			refreshCh, refreshChDone := chToType[events.Event, events.UserRefreshed](b.GetEvents(events.UserRefreshed{}))
 			defer refreshChDone()
 			require.Equal(t, userID, (<-refreshCh).UserID)
 			// Then sync event
 			syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
 			defer done()
--- a/internal/bridge/send_test.go
+++ b/internal/bridge/send_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -33,7 +33,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	smtpservice "github.com/ProtonMail/proton-bridge/v3/internal/services/smtp"
 	"github.com/emersion/go-imap"
 	"github.com/emersion/go-sasl"
 	"github.com/emersion/go-smtp"
@ -46,12 +45,17 @@ func TestBridge_Send(t *testing.T) {
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			senderUserID, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
 			recipientUserID, err := bridge.LoginFull(ctx, "recipient", password, nil, nil)
 			require.NoError(t, err)
 			smtpWaiter.Wait()
 			senderInfo, err := bridge.GetUserInfo(senderUserID)
 			require.NoError(t, err)
@ -332,9 +336,6 @@ func TestBridge_SendInvite(t *testing.T) {
 }
 func TestBridge_SendAddTextBodyPartIfNotExists(t *testing.T) {
 	// NOTE: Prior to GODT-2887, these tests had inline images, however after the implementation to support
 	// inline images new parts are injected to reference inline images without content-id set. The images
 	// in this test have been changed to regular attachments to keep the original checks in place.
 	const messageMultipartWithoutText = `Content-Type: multipart/mixed;
  boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
 Subject: A new message
@ -342,7 +343,7 @@ Date: Mon, 13 Mar 2023 16:06:16 +0100
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
-Content-Disposition: attachment;
+Content-Disposition: inline;
  filename=Cat_August_2010-4.jpeg
 Content-Type: image/jpeg;
  name="Cat_August_2010-4.jpeg"
@ -359,7 +360,7 @@ Subject: A new message Part2
 Date: Mon, 13 Mar 2023 16:06:16 +0100
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
-Content-Disposition: attachment;
+Content-Disposition: inline;
  filename=Cat_August_2010-4.jpeg
 Content-Type: image/jpeg;
  name="Cat_August_2010-4.jpeg"
@ -404,6 +405,9 @@ SGVsbG8gd29ybGQK
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			senderUserID, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
@ -423,6 +427,8 @@ SGVsbG8gd29ybGQK
 				messageMultipartWithoutTextWithTextAttachment,
 			}
 			smtpWaiter.Wait()
 			for _, m := range messages {
 				// Dial the server.
 				client, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
@ -461,9 +467,7 @@ SGVsbG8gd29ybGQK
 			require.Eventually(t, func() bool {
 				messages, err := clientFetch(senderIMAPClient, `Sent`, imap.FetchBodyStructure)
 				require.NoError(t, err)
-				if len(messages) != 4 {
+				require.Equal(t, 4, len(messages))
 					return false
 				}
 				// messages may not be in order
 				for _, message := range messages {
@ -514,224 +518,3 @@ SGVsbG8gd29ybGQK
 		})
 	})
 }
 func TestBridge_SendInlineImage(t *testing.T) {
 	const messageInlineImageOnly = `Content-Type: multipart/mixed;
  boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
 Subject: A new message
 Date: Mon, 13 Mar 2023 16:06:16 +0100
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
 Content-Disposition: inline;
  filename=Cat_August_2010-4.jpeg
 Content-Type: image/jpeg;
  name="Cat_August_2010-4.jpeg"
 Content-Transfer-Encoding: base64
 SGVsbG8gd29ybGQ=
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
 	`
 	const messageInlineImageWithHTML = `Content-Type: multipart/mixed;
  boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
 Subject: A new message Part2 
 Date: Mon, 13 Mar 2023 16:06:16 +0100
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
 Content-Type: text/html;charset=utf8
 Content-Transfer-Encoding: quoted-printable
 Hello world
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
 Content-Disposition: inline;
  filename=Cat_August_2010-4.jpeg
 Content-Type: image/jpeg;
  name="Cat_August_2010-4.jpeg"
 Content-Transfer-Encoding: base64
 SGVsbG8gd29ybGQ=
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
 `
 	const messageInlineImageWithText = `Content-Type: multipart/mixed;
  boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
 Subject: A new message Part3
 Date: Mon, 13 Mar 2023 16:06:16 +0100
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
 Content-Type: text/plain;charset=utf8
 Content-Transfer-Encoding: quoted-printable
 Hello world
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
 Content-Disposition: inline;
  filename=Cat_August_2010-4.jpeg
 Content-Type: image/jpeg;
  name="Cat_August_2010-4.jpeg"
 Content-Transfer-Encoding: base64
 SGVsbG8gd29ybGQ=
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
 `
 	const messageInlineImageFollowedByText = `Content-Type: multipart/mixed;
  boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
 Subject: A new message Part4
 Date: Mon, 13 Mar 2023 16:06:16 +0100
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
 Content-Disposition: inline;
  filename=Cat_August_2010-4.jpeg
 Content-Type: image/jpeg;
  name="Cat_August_2010-4.jpeg"
 Content-Transfer-Encoding: base64
 SGVsbG8gd29ybGQ=
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
 Content-Type: text/plain;charset=utf8
 Content-Transfer-Encoding: quoted-printable
 Hello world
 --Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
 `
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		_, _, err := s.CreateUser("recipient", password)
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			senderUserID, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
 			recipientUserID, err := bridge.LoginFull(ctx, "recipient", password, nil, nil)
 			require.NoError(t, err)
 			senderInfo, err := bridge.GetUserInfo(senderUserID)
 			require.NoError(t, err)
 			recipientInfo, err := bridge.GetUserInfo(recipientUserID)
 			require.NoError(t, err)
 			messages := []string{
 				messageInlineImageOnly,
 				messageInlineImageWithHTML,
 				messageInlineImageWithText,
 				messageInlineImageFollowedByText,
 			}
 			for _, m := range messages {
 				// Dial the server.
 				client, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
 				require.NoError(t, err)
 				defer client.Close() //nolint:errcheck
 				// Upgrade to TLS.
 				require.NoError(t, client.StartTLS(&tls.Config{InsecureSkipVerify: true}))
 				// Authorize with SASL LOGIN.
 				require.NoError(t, client.Auth(sasl.NewLoginClient(
 					senderInfo.Addresses[0],
 					string(senderInfo.BridgePass)),
 				))
 				// Send the message.
 				require.NoError(t, client.SendMail(
 					senderInfo.Addresses[0],
 					[]string{recipientInfo.Addresses[0]},
 					strings.NewReader(m),
 				))
 			}
 			// Connect the sender IMAP client.
 			senderIMAPClient, err := eventuallyDial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetIMAPPort())))
 			require.NoError(t, err)
 			require.NoError(t, senderIMAPClient.Login(senderInfo.Addresses[0], string(senderInfo.BridgePass)))
 			defer senderIMAPClient.Logout() //nolint:errcheck
 			// Connect the recipient IMAP client.
 			recipientIMAPClient, err := eventuallyDial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetIMAPPort())))
 			require.NoError(t, err)
 			require.NoError(t, recipientIMAPClient.Login(recipientInfo.Addresses[0], string(recipientInfo.BridgePass)))
 			defer recipientIMAPClient.Logout() //nolint:errcheck
 			require.Eventually(t, func() bool {
 				messages, err := clientFetch(senderIMAPClient, `Sent`, imap.FetchBodyStructure)
 				require.NoError(t, err)
 				if len(messages) != 4 {
 					return false
 				}
 				// messages may not be in order
 				for _, message := range messages {
 					require.Equal(t, 1, len(message.BodyStructure.Parts))
 					require.Equal(t, "multipart", message.BodyStructure.MIMEType)
 					require.Equal(t, "mixed", message.BodyStructure.MIMESubType)
 					require.Equal(t, "multipart", message.BodyStructure.Parts[0].MIMEType)
 					require.Equal(t, "related", message.BodyStructure.Parts[0].MIMESubType)
 					require.Len(t, message.BodyStructure.Parts[0].Parts, 2)
 					require.Equal(t, "text", message.BodyStructure.Parts[0].Parts[0].MIMEType)
 					require.Equal(t, "html", message.BodyStructure.Parts[0].Parts[0].MIMESubType)
 					require.Equal(t, "image", message.BodyStructure.Parts[0].Parts[1].MIMEType)
 					require.Equal(t, "jpeg", message.BodyStructure.Parts[0].Parts[1].MIMESubType)
 				}
 				return true
 			}, 10*time.Second, 100*time.Millisecond)
 		})
 	})
 }
 func TestBridge_SendAddressDisabled(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		recipientUserID, _, err := s.CreateUser("recipient", password)
 		require.NoError(t, err)
 		senderUserID, addrID, err := s.CreateUser("sender", password)
 		require.NoError(t, err)
 		require.NoError(t, s.ChangeAddressAllowSend(senderUserID, addrID, false))
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			senderUserID, err := bridge.LoginFull(ctx, "sender", password, nil, nil)
 			require.NoError(t, err)
 			_, err = bridge.LoginFull(ctx, "recipient", password, nil, nil)
 			require.NoError(t, err)
 			recipientInfo, err := bridge.GetUserInfo(recipientUserID)
 			require.NoError(t, err)
 			senderInfo, err := bridge.GetUserInfo(senderUserID)
 			require.NoError(t, err)
 			// Dial the server.
 			client, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
 			require.NoError(t, err)
 			defer client.Close() //nolint:errcheck
 			// Upgrade to TLS.
 			require.NoError(t, client.StartTLS(&tls.Config{InsecureSkipVerify: true}))
 			require.NoError(t, client.Auth(sasl.NewLoginClient(
 				senderInfo.Addresses[0],
 				string(senderInfo.BridgePass)),
 			))
 			// Send the message.
 			err = client.SendMail(
 				senderInfo.Addresses[0],
 				[]string{recipientInfo.Addresses[0]},
 				strings.NewReader("Subject: Test 1\r\n\r\nHello world!"),
 			)
 			smtpErr := smtpservice.NewErrCannotSendFromAddress(senderInfo.Addresses[0])
 			require.Equal(t, fmt.Sprintf("Error: %v", smtpErr.Error()), err.Error())
 		})
 	})
 }
--- a/internal/bridge/sentry_test.go
+++ b/internal/bridge/sentry_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -36,6 +36,9 @@ import (
 func TestBridge_Report(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(b)
 			defer imapWaiter.Done()
 			syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
 			defer done()
@ -51,6 +54,8 @@ func TestBridge_Report(t *testing.T) {
 			require.NoError(t, err)
 			require.True(t, info.State == bridge.Connected)
 			imapWaiter.Wait()
 			// Dial the IMAP port.
 			conn, err := net.Dial("tcp", fmt.Sprintf("%v:%v", constants.Host, b.GetIMAPPort()))
 			require.NoError(t, err)
--- a/internal/bridge/server_manager.go
+++ b/internal/bridge/server_manager.go
@ -0,0 +1,696 @@
 // Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
 // Proton Mail 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.
 //
 // Proton Mail 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 Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 package bridge
 import (
 	"context"
 	"fmt"
 	"net"
 	"path/filepath"
 	"github.com/ProtonMail/gluon"
 	"github.com/ProtonMail/gluon/connector"
 	"github.com/ProtonMail/gluon/logging"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v3/internal/user"
 	"github.com/ProtonMail/proton-bridge/v3/pkg/cpc"
 	"github.com/emersion/go-smtp"
 	"github.com/sirupsen/logrus"
 )
 // ServerManager manages the IMAP & SMTP servers and their listeners.
 type ServerManager struct {
 	requests *cpc.CPC
 	imapServer   *gluon.Server
 	imapListener net.Listener
 	smtpServer   *smtp.Server
 	smtpListener net.Listener
 	loadedUserCount int
 }
 func newServerManager() *ServerManager {
 	return &ServerManager{
 		requests: cpc.NewCPC(),
 	}
 }
 func (sm *ServerManager) Init(bridge *Bridge) error {
 	imapServer, err := createIMAPServer(bridge)
 	if err != nil {
 		return err
 	}
 	smtpServer := createSMTPServer(bridge)
 	sm.imapServer = imapServer
 	sm.smtpServer = smtpServer
 	bridge.tasks.Once(func(ctx context.Context) {
 		logging.DoAnnotated(ctx, func(ctx context.Context) {
 			sm.run(ctx, bridge)
 		}, logging.Labels{
 			"service": "server-manager",
 		})
 	})
 	return nil
 }
 func (sm *ServerManager) CloseServers(ctx context.Context) error {
 	defer sm.requests.Close()
 	_, err := sm.requests.Send(ctx, &smRequestClose{})
 	return err
 }
 func (sm *ServerManager) RestartIMAP(ctx context.Context) error {
 	_, err := sm.requests.Send(ctx, &smRequestRestartIMAP{})
 	return err
 }
 func (sm *ServerManager) RestartSMTP(ctx context.Context) error {
 	_, err := sm.requests.Send(ctx, &smRequestRestartSMTP{})
 	return err
 }
 func (sm *ServerManager) AddIMAPUser(ctx context.Context, user *user.User) error {
 	_, err := sm.requests.Send(ctx, &smRequestAddIMAPUser{user: user})
 	return err
 }
 func (sm *ServerManager) RemoveIMAPUser(ctx context.Context, user *user.User, withData bool) error {
 	_, err := sm.requests.Send(ctx, &smRequestRemoveIMAPUser{
 		user:     user,
 		withData: withData,
 	})
 	return err
 }
 func (sm *ServerManager) SetGluonDir(ctx context.Context, gluonDir string) error {
 	_, err := sm.requests.Send(ctx, &smRequestSetGluonDir{
 		dir: gluonDir,
 	})
 	return err
 }
 func (sm *ServerManager) AddGluonUser(ctx context.Context, conn connector.Connector, passphrase []byte) (string, error) {
 	reply, err := cpc.SendTyped[string](ctx, sm.requests, &smRequestAddGluonUser{
 		conn:       conn,
 		passphrase: passphrase,
 	})
 	return reply, err
 }
 func (sm *ServerManager) RemoveGluonUser(ctx context.Context, gluonID string) error {
 	_, err := sm.requests.Send(ctx, &smRequestRemoveGluonUser{
 		userID: gluonID,
 	})
 	return err
 }
 func (sm *ServerManager) run(ctx context.Context, bridge *Bridge) {
 	eventCh, cancel := bridge.GetEvents()
 	defer cancel()
 	for {
 		select {
 		case <-ctx.Done():
 			sm.handleClose(ctx, bridge)
 			return
 		case evt := <-eventCh:
 			switch evt.(type) {
 			case events.ConnStatusDown:
 				logrus.Info("Server Manager, network down stopping listeners")
 				if err := sm.closeSMTPServer(bridge); err != nil {
 					logrus.WithError(err).Error("Failed to close SMTP server")
 				}
 				if err := sm.stopIMAPListener(bridge); err != nil {
 					logrus.WithError(err)
 				}
 			case events.ConnStatusUp:
 				logrus.Info("Server Manager, network up starting listeners")
 				sm.handleLoadedUserCountChange(ctx, bridge)
 			}
 		case request, ok := <-sm.requests.ReceiveCh():
 			if !ok {
 				return
 			}
 			switch r := request.Value().(type) {
 			case *smRequestClose:
 				sm.handleClose(ctx, bridge)
 				request.Reply(ctx, nil, nil)
 				return
 			case *smRequestRestartSMTP:
 				err := sm.restartSMTP(bridge)
 				request.Reply(ctx, nil, err)
 			case *smRequestRestartIMAP:
 				err := sm.restartIMAP(ctx, bridge)
 				request.Reply(ctx, nil, err)
 			case *smRequestAddIMAPUser:
 				err := sm.handleAddIMAPUser(ctx, r.user)
 				request.Reply(ctx, nil, err)
 				if err == nil {
 					sm.loadedUserCount++
 					sm.handleLoadedUserCountChange(ctx, bridge)
 				}
 			case *smRequestRemoveIMAPUser:
 				err := sm.handleRemoveIMAPUser(ctx, r.user, r.withData)
 				request.Reply(ctx, nil, err)
 				if err == nil {
 					sm.loadedUserCount--
 					sm.handleLoadedUserCountChange(ctx, bridge)
 				}
 			case *smRequestSetGluonDir:
 				err := sm.handleSetGluonDir(ctx, bridge, r.dir)
 				request.Reply(ctx, nil, err)
 			case *smRequestAddGluonUser:
 				id, err := sm.handleAddGluonUser(ctx, r.conn, r.passphrase)
 				request.Reply(ctx, id, err)
 			case *smRequestRemoveGluonUser:
 				err := sm.handleRemoveGluonUser(ctx, r.userID)
 				request.Reply(ctx, nil, err)
 			}
 		}
 	}
 }
 func (sm *ServerManager) handleLoadedUserCountChange(ctx context.Context, bridge *Bridge) {
 	logrus.Infof("Validating Listener State %v", sm.loadedUserCount)
 	if sm.shouldStartServers() {
 		if sm.imapListener == nil {
 			if err := sm.serveIMAP(ctx, bridge); err != nil {
 				logrus.WithError(err).Error("Failed to start IMAP server")
 			}
 		}
 		if sm.smtpListener == nil {
 			if err := sm.restartSMTP(bridge); err != nil {
 				logrus.WithError(err).Error("Failed to start SMTP server")
 			}
 		}
 	} else {
 		if sm.imapListener != nil {
 			if err := sm.stopIMAPListener(bridge); err != nil {
 				logrus.WithError(err).Error("Failed to stop IMAP server")
 			}
 		}
 		if sm.smtpListener != nil {
 			if err := sm.closeSMTPServer(bridge); err != nil {
 				logrus.WithError(err).Error("Failed to stop SMTP server")
 			}
 		}
 	}
 }
 func (sm *ServerManager) handleClose(ctx context.Context, bridge *Bridge) {
 	// Close the IMAP server.
 	if err := sm.closeIMAPServer(ctx, bridge); err != nil {
 		logrus.WithError(err).Error("Failed to close IMAP server")
 	}
 	// Close the SMTP server.
 	if err := sm.closeSMTPServer(bridge); err != nil {
 		logrus.WithError(err).Error("Failed to close SMTP server")
 	}
 }
 func (sm *ServerManager) handleAddIMAPUser(ctx context.Context, user *user.User) error {
 	if sm.imapServer == nil {
 		return fmt.Errorf("no imap server instance running")
 	}
 	imapConn, err := user.NewIMAPConnectors()
 	if err != nil {
 		return fmt.Errorf("failed to create IMAP connectors: %w", err)
 	}
 	for addrID, imapConn := range imapConn {
 		log := logrus.WithFields(logrus.Fields{
 			"userID": user.ID(),
 			"addrID": addrID,
 		})
 		if gluonID, ok := user.GetGluonID(addrID); ok {
 			log.WithField("gluonID", gluonID).Info("Loading existing IMAP user")
 			// Load the user, checking whether the DB was newly created.
 			isNew, err := sm.imapServer.LoadUser(ctx, imapConn, gluonID, user.GluonKey())
 			if err != nil {
 				return fmt.Errorf("failed to load IMAP user: %w", err)
 			}
 			if isNew {
 				// If the DB was newly created, clear the sync status; gluon's DB was not found.
 				logrus.Warn("IMAP user DB was newly created, clearing sync status")
 				// Remove the user from IMAP so we can clear the sync status.
 				if err := sm.imapServer.RemoveUser(ctx, gluonID, false); err != nil {
 					return fmt.Errorf("failed to remove IMAP user: %w", err)
 				}
 				// Clear the sync status -- we need to resync all messages.
 				if err := user.ClearSyncStatus(); err != nil {
 					return fmt.Errorf("failed to clear sync status: %w", err)
 				}
 				// Add the user back to the IMAP server.
 				if isNew, err := sm.imapServer.LoadUser(ctx, imapConn, gluonID, user.GluonKey()); err != nil {
 					return fmt.Errorf("failed to add IMAP user: %w", err)
 				} else if isNew {
 					panic("IMAP user should already have a database")
 				}
 			} else if status := user.GetSyncStatus(); !status.HasLabels {
 				// Otherwise, the DB already exists -- if the labels are not yet synced, we need to re-create the DB.
 				if err := sm.imapServer.RemoveUser(ctx, gluonID, true); err != nil {
 					return fmt.Errorf("failed to remove old IMAP user: %w", err)
 				}
 				if err := user.RemoveGluonID(addrID, gluonID); err != nil {
 					return fmt.Errorf("failed to remove old IMAP user ID: %w", err)
 				}
 				gluonID, err := sm.imapServer.AddUser(ctx, imapConn, user.GluonKey())
 				if err != nil {
 					return fmt.Errorf("failed to add IMAP user: %w", err)
 				}
 				if err := user.SetGluonID(addrID, gluonID); err != nil {
 					return fmt.Errorf("failed to set IMAP user ID: %w", err)
 				}
 				log.WithField("gluonID", gluonID).Info("Re-created IMAP user")
 			}
 		} else {
 			log.Info("Creating new IMAP user")
 			gluonID, err := sm.imapServer.AddUser(ctx, imapConn, user.GluonKey())
 			if err != nil {
 				return fmt.Errorf("failed to add IMAP user: %w", err)
 			}
 			if err := user.SetGluonID(addrID, gluonID); err != nil {
 				return fmt.Errorf("failed to set IMAP user ID: %w", err)
 			}
 			log.WithField("gluonID", gluonID).Info("Created new IMAP user")
 		}
 	}
 	// Trigger a sync for the user, if needed.
 	user.TriggerSync()
 	return nil
 }
 func (sm *ServerManager) handleRemoveIMAPUser(ctx context.Context, user *user.User, withData bool) error {
 	if sm.imapServer == nil {
 		return fmt.Errorf("no imap server instance running")
 	}
 	logrus.WithFields(logrus.Fields{
 		"userID":   user.ID(),
 		"withData": withData,
 	}).Debug("Removing IMAP user")
 	for addrID, gluonID := range user.GetGluonIDs() {
 		if err := sm.imapServer.RemoveUser(ctx, gluonID, withData); err != nil {
 			return fmt.Errorf("failed to remove IMAP user: %w", err)
 		}
 		if withData {
 			if err := user.RemoveGluonID(addrID, gluonID); err != nil {
 				return fmt.Errorf("failed to remove IMAP user ID: %w", err)
 			}
 		}
 	}
 	return nil
 }
 func createIMAPServer(bridge *Bridge) (*gluon.Server, error) {
 	gluonDataDir, err := bridge.GetGluonDataDir()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get Gluon Database directory: %w", err)
 	}
 	return newIMAPServer(
 		bridge.vault.GetGluonCacheDir(),
 		gluonDataDir,
 		bridge.curVersion,
 		bridge.tlsConfig,
 		bridge.reporter,
 		bridge.logIMAPClient,
 		bridge.logIMAPServer,
 		bridge.imapEventCh,
 		bridge.tasks,
 		bridge.uidValidityGenerator,
 		bridge.panicHandler,
 	)
 }
 func createSMTPServer(bridge *Bridge) *smtp.Server {
 	return newSMTPServer(bridge, bridge.tlsConfig, bridge.logSMTP)
 }
 func (sm *ServerManager) closeSMTPServer(bridge *Bridge) error {
 	// We close the listener ourselves even though it's also closed by smtpServer.Close().
 	// This is because smtpServer.Serve() is called in a separate goroutine and might be executed
 	// after we've already closed the server. However, go-smtp has a bug; it blocks on the listener
 	// even after the server has been closed. So we close the listener ourselves to unblock it.
 	if sm.smtpListener != nil {
 		logrus.Info("Closing SMTP Listener")
 		if err := sm.smtpListener.Close(); err != nil {
 			return fmt.Errorf("failed to close SMTP listener: %w", err)
 		}
 		sm.smtpListener = nil
 	}
 	if sm.smtpServer != nil {
 		logrus.Info("Closing SMTP server")
 		if err := sm.smtpServer.Close(); err != nil {
 			logrus.WithError(err).Debug("Failed to close SMTP server (expected -- we close the listener ourselves)")
 		}
 		sm.smtpServer = nil
 		bridge.publish(events.SMTPServerStopped{})
 	}
 	return nil
 }
 func (sm *ServerManager) closeIMAPServer(ctx context.Context, bridge *Bridge) error {
 	if sm.imapListener != nil {
 		logrus.Info("Closing IMAP Listener")
 		if err := sm.imapListener.Close(); err != nil {
 			return fmt.Errorf("failed to close IMAP listener: %w", err)
 		}
 		sm.imapListener = nil
 		bridge.publish(events.IMAPServerStopped{})
 	}
 	if sm.imapServer != nil {
 		logrus.Info("Closing IMAP server")
 		if err := sm.imapServer.Close(ctx); err != nil {
 			return fmt.Errorf("failed to close IMAP server: %w", err)
 		}
 		sm.imapServer = nil
 	}
 	return nil
 }
 func (sm *ServerManager) restartIMAP(ctx context.Context, bridge *Bridge) error {
 	logrus.Info("Restarting IMAP server")
 	if sm.imapListener != nil {
 		if err := sm.imapListener.Close(); err != nil {
 			return fmt.Errorf("failed to close IMAP listener: %w", err)
 		}
 		sm.imapListener = nil
 		bridge.publish(events.IMAPServerStopped{})
 	}
 	if sm.shouldStartServers() {
 		return sm.serveIMAP(ctx, bridge)
 	}
 	return nil
 }
 func (sm *ServerManager) restartSMTP(bridge *Bridge) error {
 	logrus.Info("Restarting SMTP server")
 	if err := sm.closeSMTPServer(bridge); err != nil {
 		return fmt.Errorf("failed to close SMTP: %w", err)
 	}
 	bridge.publish(events.SMTPServerStopped{})
 	sm.smtpServer = newSMTPServer(bridge, bridge.tlsConfig, bridge.logSMTP)
 	if sm.shouldStartServers() {
 		return sm.serveSMTP(bridge)
 	}
 	return nil
 }
 func (sm *ServerManager) serveSMTP(bridge *Bridge) error {
 	port, err := func() (int, error) {
 		logrus.WithFields(logrus.Fields{
 			"port": bridge.vault.GetSMTPPort(),
 			"ssl":  bridge.vault.GetSMTPSSL(),
 		}).Info("Starting SMTP server")
 		smtpListener, err := newListener(bridge.vault.GetSMTPPort(), bridge.vault.GetSMTPSSL(), bridge.tlsConfig)
 		if err != nil {
 			return 0, fmt.Errorf("failed to create SMTP listener: %w", err)
 		}
 		sm.smtpListener = smtpListener
 		bridge.tasks.Once(func(context.Context) {
 			if err := sm.smtpServer.Serve(smtpListener); err != nil {
 				logrus.WithError(err).Info("SMTP server stopped")
 			}
 		})
 		if err := bridge.vault.SetSMTPPort(getPort(smtpListener.Addr())); err != nil {
 			return 0, fmt.Errorf("failed to store SMTP port in vault: %w", err)
 		}
 		return getPort(smtpListener.Addr()), nil
 	}()
 	if err != nil {
 		bridge.publish(events.SMTPServerError{
 			Error: err,
 		})
 		return err
 	}
 	bridge.publish(events.SMTPServerReady{
 		Port: port,
 	})
 	return nil
 }
 func (sm *ServerManager) serveIMAP(ctx context.Context, bridge *Bridge) error {
 	port, err := func() (int, error) {
 		if sm.imapServer == nil {
 			return 0, fmt.Errorf("no IMAP server instance running")
 		}
 		logrus.WithFields(logrus.Fields{
 			"port": bridge.vault.GetIMAPPort(),
 			"ssl":  bridge.vault.GetIMAPSSL(),
 		}).Info("Starting IMAP server")
 		imapListener, err := newListener(bridge.vault.GetIMAPPort(), bridge.vault.GetIMAPSSL(), bridge.tlsConfig)
 		if err != nil {
 			return 0, fmt.Errorf("failed to create IMAP listener: %w", err)
 		}
 		sm.imapListener = imapListener
 		if err := sm.imapServer.Serve(ctx, sm.imapListener); err != nil {
 			return 0, fmt.Errorf("failed to serve IMAP: %w", err)
 		}
 		if err := bridge.vault.SetIMAPPort(getPort(imapListener.Addr())); err != nil {
 			return 0, fmt.Errorf("failed to store IMAP port in vault: %w", err)
 		}
 		return getPort(imapListener.Addr()), nil
 	}()
 	if err != nil {
 		bridge.publish(events.IMAPServerError{
 			Error: err,
 		})
 		return err
 	}
 	bridge.publish(events.IMAPServerReady{
 		Port: port,
 	})
 	return nil
 }
 func (sm *ServerManager) stopIMAPListener(bridge *Bridge) error {
 	logrus.Info("Stopping IMAP listener")
 	if sm.imapListener != nil {
 		if err := sm.imapListener.Close(); err != nil {
 			return err
 		}
 		sm.imapListener = nil
 		bridge.publish(events.IMAPServerStopped{})
 	}
 	return nil
 }
 func (sm *ServerManager) handleSetGluonDir(ctx context.Context, bridge *Bridge, newGluonDir string) error {
 	return safe.RLockRet(func() error {
 		currentGluonDir := bridge.GetGluonCacheDir()
 		newGluonDir = filepath.Join(newGluonDir, "gluon")
 		if newGluonDir == currentGluonDir {
 			return fmt.Errorf("new gluon dir is the same as the old one")
 		}
 		if err := sm.closeIMAPServer(context.Background(), bridge); err != nil {
 			return fmt.Errorf("failed to close IMAP: %w", err)
 		}
 		sm.loadedUserCount = 0
 		if err := bridge.moveGluonCacheDir(currentGluonDir, newGluonDir); err != nil {
 			logrus.WithError(err).Error("failed to move GluonCacheDir")
 			if err := bridge.vault.SetGluonDir(currentGluonDir); err != nil {
 				return fmt.Errorf("failed to revert GluonCacheDir: %w", err)
 			}
 		}
 		bridge.heartbeat.SetCacheLocation(newGluonDir)
 		gluonDataDir, err := bridge.GetGluonDataDir()
 		if err != nil {
 			return fmt.Errorf("failed to get Gluon Database directory: %w", err)
 		}
 		imapServer, err := newIMAPServer(
 			bridge.vault.GetGluonCacheDir(),
 			gluonDataDir,
 			bridge.curVersion,
 			bridge.tlsConfig,
 			bridge.reporter,
 			bridge.logIMAPClient,
 			bridge.logIMAPServer,
 			bridge.imapEventCh,
 			bridge.tasks,
 			bridge.uidValidityGenerator,
 			bridge.panicHandler,
 		)
 		if err != nil {
 			return fmt.Errorf("failed to create new IMAP server: %w", err)
 		}
 		sm.imapServer = imapServer
 		for _, bridgeUser := range bridge.users {
 			if err := sm.handleAddIMAPUser(ctx, bridgeUser); err != nil {
 				return fmt.Errorf("failed to add users to new IMAP server: %w", err)
 			}
 			sm.loadedUserCount++
 		}
 		if sm.shouldStartServers() {
 			if err := sm.serveIMAP(ctx, bridge); err != nil {
 				return fmt.Errorf("failed to serve IMAP: %w", err)
 			}
 		}
 		return nil
 	}, bridge.usersLock)
 }
 func (sm *ServerManager) handleAddGluonUser(ctx context.Context, conn connector.Connector, passphrase []byte) (string, error) {
 	if sm.imapServer == nil {
 		return "", fmt.Errorf("no imap server instance running")
 	}
 	return sm.imapServer.AddUser(ctx, conn, passphrase)
 }
 func (sm *ServerManager) handleRemoveGluonUser(ctx context.Context, userID string) error {
 	if sm.imapServer == nil {
 		return fmt.Errorf("no imap server instance running")
 	}
 	return sm.imapServer.RemoveUser(ctx, userID, true)
 }
 func (sm *ServerManager) shouldStartServers() bool {
 	return sm.loadedUserCount >= 1
 }
 type smRequestClose struct{}
 type smRequestRestartIMAP struct{}
 type smRequestRestartSMTP struct{}
 type smRequestAddIMAPUser struct {
 	user *user.User
 }
 type smRequestRemoveIMAPUser struct {
 	user     *user.User
 	withData bool
 }
 type smRequestSetGluonDir struct {
 	dir string
 }
 type smRequestAddGluonUser struct {
 	conn       connector.Connector
 	passphrase []byte
 }
 type smRequestRemoveGluonUser struct {
 	userID string
 }
--- a/internal/bridge/server_manager_test.go
+++ b/internal/bridge/server_manager_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -20,7 +20,6 @@ package bridge_test
 import (
 	"context"
 	"fmt"
 	"net"
 	"testing"
 	"github.com/ProtonMail/go-proton-api"
@ -28,39 +27,57 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/emersion/go-smtp"
 	"github.com/stretchr/testify/require"
 )
-func TestServerManager_ServersStartWithBridge(t *testing.T) {
+func TestServerManager_NoLoadedUsersNoServers(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
-			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
+			_, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
-			require.NoError(t, err)
+			require.Error(t, err)
 			require.NoError(t, imapClient.Logout())
 			smtpClient, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
 			require.NoError(t, err)
 			smtpClient.Close() //nolint:errcheck
 		})
 	})
 }
-func TestServerManager_ServersKeepsRunningfterUserLogsOut(t *testing.T) {
+func TestServerManager_ServersStartAfterFirstConnectedUser(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(bridge)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			_, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 		})
 	})
 }
 func TestServerManager_ServersStopsAfterUserLogsOut(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(bridge)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			userID, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			imapWaiterStopped := waitForIMAPServerStopped(bridge)
 			defer imapWaiterStopped.Done()
 			require.NoError(t, bridge.LogoutUser(ctx, userID))
-			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
+			imapWaiterStopped.Wait()
 			require.NoError(t, err)
 			require.NoError(t, imapClient.Logout())
 			smtpClient, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
 			require.NoError(t, err)
 			smtpClient.Close() //nolint:errcheck
 		})
 	})
 }
@ -73,12 +90,21 @@ func TestServerManager_ServersDoNotStopWhenThereIsStillOneActiveUser(t *testing.
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(bridge)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			_, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
 			userIDOther, err := bridge.LoginFull(ctx, otherUser, otherPassword, nil, nil)
 			require.NoError(t, err)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			evtCh, cancel := bridge.GetEvents(events.UserDeauth{})
 			defer cancel()
@ -89,10 +115,31 @@ func TestServerManager_ServersDoNotStopWhenThereIsStillOneActiveUser(t *testing.
 			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
 			require.NoError(t, err)
 			require.NoError(t, imapClient.Logout())
 		})
 	})
 }
-			smtpClient, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
+func TestServerManager_ServersStartIfAtLeastOneUserIsLoggedIn(t *testing.T) {
 	otherPassword := []byte("bar")
 	otherUser := "foo"
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		userIDOther, _, err := s.CreateUser(otherUser, otherPassword)
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			_, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
-			smtpClient.Close() //nolint:errcheck
+
 			_, err = bridge.LoginFull(ctx, otherUser, otherPassword, nil, nil)
 			require.NoError(t, err)
 		})
 		require.NoError(t, s.RevokeUser(userIDOther))
 		withBridgeWaitForServers(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
 			require.NoError(t, err)
 			require.NoError(t, imapClient.Logout())
 		})
 	})
 }
@ -115,13 +162,8 @@ func TestServerManager_NetworkLossStopsServers(t *testing.T) {
 			_, err := bridge.LoginFull(ctx, username, password, nil, nil)
 			require.NoError(t, err)
-			imapClient, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
+			imapWaiter.Wait()
-			require.NoError(t, err)
+			smtpWaiter.Wait()
 			require.NoError(t, imapClient.Logout())
 			smtpClient, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
 			require.NoError(t, err)
 			smtpClient.Close() //nolint:errcheck
 			netCtl.Disable()
--- a/internal/bridge/settings.go
+++ b/internal/bridge/settings.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -20,13 +20,14 @@ package bridge
 import (
 	"context"
 	"fmt"
 	"net"
 	"os"
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/proton-bridge/v3/internal/kb"
 	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v3/internal/services/userevents"
 	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 )
 func (bridge *Bridge) GetKeychainApp() (string, error) {
@ -130,41 +131,26 @@ func (bridge *Bridge) GetGluonDataDir() (string, error) {
 }
 func (bridge *Bridge) SetGluonDir(ctx context.Context, newGluonDir string) error {
 	bridge.usersLock.RLock()
 	defer func() {
 		logPkg.Info("Restarting user event loops")
 		for _, u := range bridge.users {
 			u.ResumeEventLoop()
 		}
 		bridge.usersLock.RUnlock()
 	}()
 	type waiter struct {
 		w  *userevents.EventPollWaiter
 		id string
 	}
 	waiters := make([]waiter, 0, len(bridge.users))
 	logPkg.Info("Pausing user event loops for gluon dir change")
 	for id, u := range bridge.users {
 		waiters = append(waiters, waiter{w: u.PauseEventLoopWithWaiter(), id: id})
 	}
 	logPkg.Info("Waiting on user event loop completion")
 	for _, waiter := range waiters {
 		if err := waiter.w.WaitPollFinished(ctx); err != nil {
 			logPkg.WithError(err).Errorf("Failed to wait on event loop pause for user %v", waiter.id)
 			return fmt.Errorf("failed on event loop pause: %w", err)
 		}
 	}
 	logPkg.Info("Changing gluon directory")
 	return bridge.serverManager.SetGluonDir(ctx, newGluonDir)
 }
 func (bridge *Bridge) moveGluonCacheDir(oldGluonDir, newGluonDir string) error {
 	logrus.Infof("gluon cache moving from %s to %s", oldGluonDir, newGluonDir)
 	oldCacheDir := ApplyGluonCachePathSuffix(oldGluonDir)
 	if err := copyDir(oldCacheDir, ApplyGluonCachePathSuffix(newGluonDir)); err != nil {
 		return fmt.Errorf("failed to copy gluon dir: %w", err)
 	}
 	if err := bridge.vault.SetGluonDir(newGluonDir); err != nil {
 		return fmt.Errorf("failed to set new gluon cache dir: %w", err)
 	}
 	if err := os.RemoveAll(oldCacheDir); err != nil {
 		logrus.WithError(err).Error("failed to remove old gluon cache dir")
 	}
 	return nil
 }
 func (bridge *Bridge) GetProxyAllowed() bool {
 	return bridge.vault.GetProxyAllowed()
 }
@ -261,12 +247,9 @@ func (bridge *Bridge) SetTelemetryDisabled(isDisabled bool) error {
 		return err
 	}
 	// If telemetry is re-enabled locally, try to send the heartbeat.
-	if isDisabled {
+	if !isDisabled {
-		bridge.heartbeat.stop()
+		defer bridge.goHeartbeat()
 	} else {
 		bridge.heartbeat.start()
 	}
 	return nil
 }
@ -310,10 +293,6 @@ func (bridge *Bridge) SetColorScheme(colorScheme string) error {
 	return bridge.vault.SetColorScheme(colorScheme)
 }
 func (bridge *Bridge) GetKnowledgeBaseSuggestions(userInput string) (kb.ArticleList, error) {
 	return kb.GetSuggestions(userInput)
 }
 // FactoryReset deletes all users, wipes the vault, and deletes all files.
 // Note: it does not clear the keychain. The only entry in the keychain is the vault password,
 // which we need at next startup to decrypt the vault.
@ -329,13 +308,26 @@ func (bridge *Bridge) FactoryReset(ctx context.Context) {
 	// Wipe the vault.
 	gluonCacheDir, err := bridge.locator.ProvideGluonCachePath()
 	if err != nil {
-		logPkg.WithError(err).Error("Failed to provide gluon dir")
+		logrus.WithError(err).Error("Failed to provide gluon dir")
 	} else if err := bridge.vault.Reset(gluonCacheDir); err != nil {
-		logPkg.WithError(err).Error("Failed to reset vault")
+		logrus.WithError(err).Error("Failed to reset vault")
 	}
 	// Lastly, delete all files except the vault.
 	if err := bridge.locator.Clear(bridge.vault.Path()); err != nil {
-		logPkg.WithError(err).Error("Failed to clear data paths")
+		logrus.WithError(err).Error("Failed to clear data paths")
 	}
 }
 func getPort(addr net.Addr) int {
 	switch addr := addr.(type) {
 	case *net.TCPAddr:
 		return addr.Port
 	case *net.UDPAddr:
 		return addr.Port
 	default:
 		return 0
 	}
 }
--- a/internal/bridge/settings_test.go
+++ b/internal/bridge/settings_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -25,7 +25,6 @@ import (
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
 	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/stretchr/testify/require"
 )
@ -52,45 +51,6 @@ func TestBridge_Settings_GluonDir(t *testing.T) {
 	})
 }
 func TestBridge_Settings_GluonDirWithOnGoingEvents(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		userID, addrID, err := s.CreateUser("imap", password)
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
 			defer done()
 			_, err := bridge.LoginFull(context.Background(), "imap", password, nil, nil)
 			require.NoError(t, err)
 			<-syncCh
 		})
 		labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
 		require.NoError(t, err)
 		withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 			createNumMessages(ctx, t, c, addrID, labelID, 200)
 		})
 		withBridgeWaitForServers(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			// Create a new location for the Gluon data.
 			newGluonDir := t.TempDir()
 			// Move the gluon dir; it should also move the user's data.
 			require.NoError(t, bridge.SetGluonDir(context.Background(), newGluonDir))
 			// Check that the new directory is not empty.
 			entries, err := os.ReadDir(newGluonDir)
 			require.NoError(t, err)
 			// There should be at least one entry.
 			require.NotEmpty(t, entries)
 		})
 	})
 }
 func TestBridge_Settings_IMAPPort(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
--- a/internal/bridge/smtp.go
+++ b/internal/bridge/smtp.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -21,37 +21,43 @@ import (
 	"context"
 	"crypto/tls"
-	"github.com/ProtonMail/proton-bridge/v3/internal/identifier"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
 	"github.com/emersion/go-sasl"
 	"github.com/emersion/go-smtp"
 	"github.com/sirupsen/logrus"
 )
 func (bridge *Bridge) restartSMTP(ctx context.Context) error {
 	return bridge.serverManager.RestartSMTP(ctx)
 }
-type bridgeSMTPSettings struct {
+func newSMTPServer(bridge *Bridge, tlsConfig *tls.Config, logSMTP bool) *smtp.Server {
-	b *Bridge
+	logrus.WithField("logSMTP", logSMTP).Info("Creating SMTP server")
 }
-func (b *bridgeSMTPSettings) TLSConfig() *tls.Config {
+	smtpServer := smtp.NewServer(&smtpBackend{Bridge: bridge})
 	return b.b.tlsConfig
 }
-func (b *bridgeSMTPSettings) Log() bool {
+	smtpServer.TLSConfig = tlsConfig
-	return b.b.logSMTP
+	smtpServer.Domain = constants.Host
-}
+	smtpServer.AllowInsecureAuth = true
 	smtpServer.MaxLineLength = 1 << 16
 	smtpServer.ErrorLog = logging.NewSMTPLogger()
-func (b *bridgeSMTPSettings) Port() int {
+	// go-smtp suppors SASL PLAIN but not LOGIN. We need to add LOGIN support ourselves.
-	return b.b.vault.GetSMTPPort()
+	smtpServer.EnableAuth(sasl.Login, func(conn *smtp.Conn) sasl.Server {
-}
+		return sasl.NewLoginServer(func(username, password string) error {
 			return conn.Session().AuthPlain(username, password)
 		})
 	})
-func (b *bridgeSMTPSettings) SetPort(i int) error {
+	if logSMTP {
-	return b.b.vault.SetSMTPPort(i)
+		log := logrus.WithField("protocol", "SMTP")
-}
+		log.Warning("================================================")
 		log.Warning("THIS LOG WILL CONTAIN **DECRYPTED** MESSAGE DATA")
 		log.Warning("================================================")
-func (b *bridgeSMTPSettings) UseSSL() bool {
+		smtpServer.Debug = logging.NewSMTPDebugLogger()
-	return b.b.vault.GetSMTPSSL()
+	}
 }
-func (b *bridgeSMTPSettings) Identifier() identifier.UserAgentUpdater {
+	return smtpServer
 	return &bridgeUserAgentUpdater{Bridge: b.b}
 }
--- a/internal/services/smtp/smtp_backend.go
+++ b/internal/services/smtp/smtp_backend.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -15,36 +15,26 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-package smtp
+package bridge
 import (
 	"context"
 	"errors"
 	"fmt"
 	"io"
 	"strings"
-	"github.com/ProtonMail/proton-bridge/v3/internal/identifier"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	"github.com/emersion/go-smtp"
 	"github.com/sirupsen/logrus"
 )
-type Backend struct {
+type smtpBackend struct {
-	accounts  *Accounts
+	*Bridge
 	userAgent identifier.UserAgentUpdater
 }
 func NewBackend(accounts *Accounts, userAgent identifier.UserAgentUpdater) *Backend {
 	return &Backend{
 		accounts:  accounts,
 		userAgent: userAgent,
 	}
 }
 type smtpSession struct {
-	accounts  *Accounts
+	*Bridge
 	userAgent identifier.UserAgentUpdater
 	userID string
 	authID string
@ -53,32 +43,45 @@ type smtpSession struct {
 	to   []string
 }
-func (be *Backend) NewSession(*smtp.Conn) (smtp.Session, error) {
+func (be *smtpBackend) NewSession(*smtp.Conn) (smtp.Session, error) {
-	return &smtpSession{accounts: be.accounts, userAgent: be.userAgent}, nil
+	return &smtpSession{Bridge: be.Bridge}, nil
 }
 func (s *smtpSession) AuthPlain(username, password string) error {
-	userID, authID, err := s.accounts.CheckAuth(username, []byte(password))
+	return safe.RLockRet(func() error {
-	if err != nil {
+		for _, user := range s.users {
-		if !errors.Is(err, ErrNoSuchUser) {
+			addrID, err := user.CheckAuth(username, []byte(password))
-			return fmt.Errorf("unknown error")
+			if err != nil {
 				continue
 			}
 			s.userID = user.ID()
 			s.authID = addrID
 			if strings.Contains(s.Bridge.GetCurrentUserAgent(), useragent.DefaultUserAgent) {
 				s.Bridge.setUserAgent(useragent.UnknownClient, useragent.DefaultVersion)
 			}
 			user.SendConfigStatusSuccess(context.Background())
 			return nil
 		}
 		logrus.WithFields(logrus.Fields{
 			"username": username,
 			"pkg":      "smtp",
 		}).Error("Incorrect login credentials.")
-
+		err := fmt.Errorf("invalid username or password")
-		return fmt.Errorf("invalid username or password")
+		for _, user := range s.users {
-	}
+			for _, mail := range user.Emails() {
-
+				if mail == username {
-	s.userID = userID
+					user.ReportConfigStatusFailure(err.Error())
-	s.authID = authID
+					return err
-
+				}
-	if strings.Contains(s.userAgent.GetUserAgent(), useragent.DefaultUserAgent) {
+			}
-		s.userAgent.SetUserAgent(useragent.UnknownClient, useragent.DefaultVersion)
+		}
-	}
+		return err
-
+	}, s.usersLock)
 	return nil
 }
 func (s *smtpSession) Reset() {
@ -105,7 +108,14 @@ func (s *smtpSession) Rcpt(to string) error {
 }
 func (s *smtpSession) Data(r io.Reader) error {
-	err := s.accounts.SendMail(context.Background(), s.userID, s.authID, s.from, s.to, r)
+	err := safe.RLockRet(func() error {
 		user, ok := s.users[s.userID]
 		if !ok {
 			return ErrNoSuchUser
 		}
 		return user.SendMail(s.authID, s.from, s.to, r)
 	}, s.usersLock)
 	if err != nil {
 		logrus.WithField("pkg", "smtp").WithError(err).Error("Send mail failed.")
--- a/internal/bridge/sync_test.go
+++ b/internal/bridge/sync_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -21,11 +21,9 @@ import (
 	"context"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
@ -37,7 +35,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/ProtonMail/proton-bridge/v3/internal/services/imapservice"
 	"github.com/bradenaw/juniper/iterator"
 	"github.com/bradenaw/juniper/stream"
 	"github.com/bradenaw/juniper/xslices"
@ -255,17 +252,14 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
 		// Login the user; its sync should fail.
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
 			syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
 			defer done()
 			{
-				syncFailedCh, syncFailedDone := chToType[events.Event, events.SyncFailed](b.GetEvents(events.SyncFailed{}))
+				syncCh, done := chToType[events.Event, events.SyncFailed](b.GetEvents(events.SyncFailed{}))
-				defer syncFailedDone()
+				defer done()
 				userID, err := b.LoginFull(ctx, "imap", password, nil, nil)
 				require.NoError(t, err)
-				require.Equal(t, userID, (<-syncFailedCh).UserID)
+				require.Equal(t, userID, (<-syncCh).UserID)
 				info, err := b.GetUserInfo(userID)
 				require.NoError(t, err)
@ -288,7 +282,11 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
 			// Remove the network limit, allowing the sync to finish.
 			netCtl.SetReadLimit(0)
 			{
 				syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
 				defer done()
 				require.Equal(t, userID, (<-syncCh).UserID)
 				info, err := b.GetUserInfo(userID)
@ -300,6 +298,12 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
 				require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
 				defer func() { _ = client.Logout() }()
 				status, err := client.Select(`Folders/folder`, false)
 				require.NoError(t, err)
 				// Original folder should have more than 0 messages and less than the total.
 				require.Greater(t, status.Messages, uint32(0))
 				require.Less(t, status.Messages, uint32(numMsg))
 				// Check that the new messages arrive in the right location.
 				require.Eventually(t, func() bool {
 					status, err := client.Select(`Folders/folder2`, true)
@ -317,379 +321,6 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
 	}, server.WithTLS(false))
 }
 func TestBridge_CanProcessEventsDuringSync(t *testing.T) {
 	numMsg := 1 << 8
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		userID, addrID, err := s.CreateUser("imap", password)
 		require.NoError(t, err)
 		labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
 		require.NoError(t, err)
 		withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 			createNumMessages(ctx, t, c, addrID, labelID, numMsg)
 		})
 		// Simulate 429 to prevent sync from progressing.
 		s.AddStatusHook(func(request *http.Request) (int, bool) {
 			if strings.Contains(request.URL.Path, "/mail/v4/messages/") {
 				return http.StatusTooManyRequests, true
 			}
 			return 0, false
 		})
 		// The initial user should be fully synced.
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
 			defer syncStartedDone()
 			addressCreatedCh, addressCreatedDone := chToType[events.Event, events.UserAddressCreated](bridge.GetEvents(events.UserAddressCreated{}))
 			defer addressCreatedDone()
 			userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
 			require.NoError(t, err)
 			require.Equal(t, userID, (<-syncStartedCh).UserID)
 			// Create a new address
 			newAddress := "foo@proton.ch"
 			addrID, err := s.CreateAddress(userID, newAddress, password)
 			require.NoError(t, err)
 			event := <-addressCreatedCh
 			require.Equal(t, userID, event.UserID)
 			require.Equal(t, newAddress, event.Email)
 			require.Equal(t, addrID, event.AddressID)
 		})
 	}, server.WithTLS(false))
 }
 func TestBridge_RefreshDuringSyncRestartSync(t *testing.T) {
 	numMsg := 1 << 8
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		userID, addrID, err := s.CreateUser("imap", password)
 		require.NoError(t, err)
 		labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
 		require.NoError(t, err)
 		withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 			createNumMessages(ctx, t, c, addrID, labelID, numMsg)
 		})
 		var refreshPerformed atomic.Bool
 		refreshPerformed.Store(false)
 		// Simulate 429 to prevent sync from progressing.
 		s.AddStatusHook(func(request *http.Request) (int, bool) {
 			if strings.Contains(request.URL.Path, "/mail/v4/messages/") {
 				if !refreshPerformed.Load() {
 					return http.StatusTooManyRequests, true
 				}
 			}
 			return 0, false
 		})
 		// The initial user should be fully synced.
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
 			defer done()
 			userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
 			require.NoError(t, err)
 			syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
 			defer syncStartedDone()
 			require.Equal(t, userID, (<-syncStartedCh).UserID)
 			require.NoError(t, err, s.RefreshUser(userID, proton.RefreshMail))
 			require.Equal(t, userID, (<-syncStartedCh).UserID)
 			refreshPerformed.Store(true)
 			require.Equal(t, userID, (<-syncCh).UserID)
 		})
 	}, server.WithTLS(false))
 }
 func TestBridge_EventReplayAfterSyncHasFinished(t *testing.T) {
 	numMsg := 1 << 8
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		userID, addrID, err := s.CreateUser("imap", password)
 		require.NoError(t, err)
 		labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
 		require.NoError(t, err)
 		withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 			createNumMessages(ctx, t, c, addrID, labelID, numMsg)
 		})
 		addrID1, err := s.CreateAddress(userID, "foo@proton.ch", password)
 		require.NoError(t, err)
 		var allowSyncToProgress atomic.Bool
 		allowSyncToProgress.Store(false)
 		// Simulate 429 to prevent sync from progressing.
 		s.AddStatusHook(func(request *http.Request) (int, bool) {
 			if request.Method == "GET" && strings.Contains(request.URL.Path, "/mail/v4/messages/") {
 				if !allowSyncToProgress.Load() {
 					return http.StatusTooManyRequests, true
 				}
 			}
 			return 0, false
 		})
 		// The initial user should be fully synced.
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
 			defer done()
 			syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
 			defer syncStartedDone()
 			addressCreatedCh, addressCreatedDone := chToType[events.Event, events.UserAddressCreated](bridge.GetEvents(events.UserAddressCreated{}))
 			defer addressCreatedDone()
 			userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
 			require.NoError(t, err)
 			require.Equal(t, userID, (<-syncStartedCh).UserID)
 			// create 20 more messages and move them to inbox
 			withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 				createNumMessages(ctx, t, c, addrID, proton.InboxLabel, 20)
 			})
 			// User AddrID2 event as a check point to see when the new address was created.
 			addrID2, err := s.CreateAddress(userID, "bar@proton.ch", password)
 			require.NoError(t, err)
 			allowSyncToProgress.Store(true)
 			require.Equal(t, userID, (<-syncCh).UserID)
 			// At most two events can be published, one for the first address, then for the second.
 			// if the second event is not `addrID2` then something went wrong.
 			event := <-addressCreatedCh
 			if event.AddressID == addrID1 {
 				event = <-addressCreatedCh
 			}
 			require.Equal(t, addrID2, event.AddressID)
 			info, err := bridge.GetUserInfo(userID)
 			require.NoError(t, err)
 			client, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
 			require.NoError(t, err)
 			require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
 			defer func() { _ = client.Logout() }()
 			// Finally check if the 20 messages are in INBOX.
 			status, err := client.Status("INBOX", []imap.StatusItem{imap.StatusMessages})
 			require.NoError(t, err)
 			require.Equal(t, uint32(20), status.Messages)
 			// Finally check if the numMsg are in the folder.
 			status, err = client.Status("Folders/folder", []imap.StatusItem{imap.StatusMessages})
 			require.NoError(t, err)
 			require.Equal(t, uint32(numMsg), status.Messages)
 		})
 	}, server.WithTLS(false))
 }
 func TestBridge_MessageCreateDuringSync(t *testing.T) {
 	numMsg := 1 << 8
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		userID, addrID, err := s.CreateUser("imap", password)
 		require.NoError(t, err)
 		labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
 		require.NoError(t, err)
 		withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 			createNumMessages(ctx, t, c, addrID, labelID, numMsg)
 		})
 		var allowSyncToProgress atomic.Bool
 		allowSyncToProgress.Store(false)
 		// Simulate 429 to prevent sync from progressing.
 		s.AddStatusHook(func(request *http.Request) (int, bool) {
 			if request.Method == "GET" && strings.Contains(request.URL.Path, "/mail/v4/messages/") {
 				if !allowSyncToProgress.Load() {
 					return http.StatusTooManyRequests, true
 				}
 			}
 			return 0, false
 		})
 		// The initial user should be fully synced.
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
 			defer syncStartedDone()
 			addressCreatedCh, addressCreatedDone := chToType[events.Event, events.UserAddressCreated](bridge.GetEvents(events.UserAddressCreated{}))
 			defer addressCreatedDone()
 			userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
 			require.NoError(t, err)
 			require.Equal(t, userID, (<-syncStartedCh).UserID)
 			// create 20 more messages and move them to inbox
 			withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 				createNumMessages(ctx, t, c, addrID, proton.InboxLabel, 20)
 			})
 			// User AddrID2 event as a check point to see when the new address was created.
 			addrID, err := s.CreateAddress(userID, "bar@proton.ch", password)
 			require.NoError(t, err)
 			// At most two events can be published, one for the first address, then for the second.
 			// if the second event is not `addrID` then something went wrong.
 			event := <-addressCreatedCh
 			require.Equal(t, addrID, event.AddressID)
 			allowSyncToProgress.Store(true)
 			info, err := bridge.GetUserInfo(userID)
 			require.NoError(t, err)
 			client, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
 			require.NoError(t, err)
 			require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
 			defer func() { _ = client.Logout() }()
 			require.Eventually(t, func() bool {
 				// Finally check if the 20 messages are in INBOX.
 				status, err := client.Status("INBOX", []imap.StatusItem{imap.StatusMessages})
 				require.NoError(t, err)
 				return uint32(20) == status.Messages
 			}, 10*time.Second, time.Second)
 		})
 	}, server.WithTLS(false))
 }
 func TestBridge_CorruptedVaultClearsPreviousIMAPSyncState(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, vaultKey []byte) {
 		userID, addrID, err := s.CreateUser("imap", password)
 		require.NoError(t, err)
 		labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
 		require.NoError(t, err)
 		withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
 			createNumMessages(ctx, t, c, addrID, labelID, 100)
 		})
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
 			defer done()
 			var err error
 			userID, err = bridge.LoginFull(context.Background(), "imap", password, nil, nil)
 			require.NoError(t, err)
 			// Wait for sync to finish
 			require.Equal(t, userID, (<-syncCh).UserID)
 		})
 		settingsPath, err := locator.ProvideSettingsPath()
 		require.NoError(t, err)
 		syncConfigPath, err := locator.ProvideIMAPSyncConfigPath()
 		require.NoError(t, err)
 		syncStatePath := imapservice.GetSyncConfigPath(syncConfigPath, userID)
 		// Check sync state is complete
 		{
 			state, err := imapservice.NewSyncState(syncStatePath)
 			require.NoError(t, err)
 			syncStatus, err := state.GetSyncStatus(context.Background())
 			require.NoError(t, err)
 			require.True(t, syncStatus.IsComplete())
 		}
 		// corrupt the vault
 		require.NoError(t, os.WriteFile(filepath.Join(settingsPath, "vault.enc"), []byte("Trash!"), 0o600))
 		// Bridge starts but can't find the gluon database dir; there should be no error.
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			_, err := bridge.LoginFull(context.Background(), "imap", password, nil, nil)
 			require.NoError(t, err)
 		})
 		// Check sync state is reset.
 		{
 			state, err := imapservice.NewSyncState(syncStatePath)
 			require.NoError(t, err)
 			syncStatus, err := state.GetSyncStatus(context.Background())
 			require.NoError(t, err)
 			require.False(t, syncStatus.IsComplete())
 		}
 	})
 }
 func TestBridge_AddressOrderChangeDuringSyncInCombinedModeDoesNotTriggerBadEventOnNewMessage(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		// Create a user.
 		userID, addrID, err := s.CreateUser("user", password)
 		require.NoError(t, err)
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
 			userInfoChanged, done := chToType[events.Event, events.UserChanged](bridge.GetEvents(events.UserChanged{}))
 			defer done()
 			withClient(ctx, t, s, "user", password, func(ctx context.Context, c *proton.Client) {
 				createNumMessages(ctx, t, c, addrID, proton.InboxLabel, 300)
 			})
 			_, err := bridge.LoginFull(ctx, "user", password, nil, nil)
 			require.NoError(t, err)
 			info, err := bridge.GetUserInfo(userID)
 			require.NoError(t, err)
 			require.Equal(t, 1, len(info.Addresses))
 			require.Equal(t, info.Addresses[0], "user@proton.local")
 			addrID2, err := s.CreateAddress(userID, "foo@"+s.GetDomain(), password)
 			require.NoError(t, err)
 			require.NoError(t, s.SetAddressOrder(userID, []string{addrID2, addrID}))
 			withClient(ctx, t, s, "user", password, func(ctx context.Context, c *proton.Client) {
 				createNumMessages(ctx, t, c, addrID2, proton.InboxLabel, 1)
 			})
 			// Since we can't intercept events at this time, we sleep for a bit to make sure the
 			// new message does not get combined into the event below. This ensures the newly created
 			// goes through the full code flow which triggered the original bad event.
 			time.Sleep(time.Second)
 			require.NoError(t, s.SetAddressOrder(userID, []string{addrID, addrID2}))
 			for i := 0; i < 2; i++ {
 				select {
 				case <-ctx.Done():
 					return
 				case e := <-userInfoChanged:
 					require.Equal(t, userID, e.UserID)
 				}
 			}
 		})
 	})
 }
 func withClient(ctx context.Context, t *testing.T, s *server.Server, username string, password []byte, fn func(context.Context, *proton.Client)) { //nolint:unparam
 	m := proton.New(
 		proton.WithHostURL(s.GetHostURL()),
--- a/internal/bridge/sync_unix_test.go
+++ b/internal/bridge/sync_unix_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -31,7 +31,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
-// Disabled due to flakiness.
+// Disabled due to flakyness.
 func _TestBridge_SyncExistsWithErrorWhenTooManyFilesAreOpen(t *testing.T) { //nolint:unused
 	var rlimitCurrent syscall.Rlimit
--- a/internal/bridge/tls.go
+++ b/internal/bridge/tls.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/bridge/types.go
+++ b/internal/bridge/types.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -32,7 +32,15 @@ type Locator interface {
 	GetLicenseFilePath() string
 	GetDependencyLicensesLink() string
 	Clear(...string) error
-	ProvideIMAPSyncConfigPath() (string, error)
+}
 type Identifier interface {
 	GetUserAgent() string
 	HasClient() bool
 	SetClient(name, version string)
 	SetPlatform(platform string)
 	SetClientString(client string)
 	GetClientString() string
 }
 type ProxyController interface {
@ -53,5 +61,4 @@ type Autostarter interface {
 type Updater interface {
 	GetVersionInfo(context.Context, updater.Downloader, updater.Channel) (updater.VersionInfo, error)
 	InstallUpdate(context.Context, updater.Downloader, updater.VersionInfo) error
 	RemoveOldUpdates() error
 }
--- a/internal/bridge/updates.go
+++ b/internal/bridge/updates.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -139,9 +139,3 @@ func (bridge *Bridge) installUpdate(ctx context.Context, job installJob) {
 		}
 	}, bridge.newVersionLock)
 }
 func (bridge *Bridge) RemoveOldUpdates() {
 	if err := bridge.updater.RemoveOldUpdates(); err != nil {
 		logrus.WithError(err).Error("Remove old updates fails")
 	}
 }
--- a/internal/bridge/user.go
+++ b/internal/bridge/user.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -28,10 +28,8 @@ import (
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/ProtonMail/proton-bridge/v3/internal/hv"
 	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
 	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v3/internal/services/imapservice"
 	"github.com/ProtonMail/proton-bridge/v3/internal/try"
 	"github.com/ProtonMail/proton-bridge/v3/internal/user"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
@ -39,8 +37,6 @@ import (
 	"github.com/sirupsen/logrus"
 )
 var logUser = logrus.WithField("pkg", "bridge/user") //nolint:gochecknoglobals
 type UserState int
 const (
@ -49,8 +45,6 @@ const (
 	Connected
 )
 var ErrFailedToUnlock = errors.New("failed to unlock user keys")
 type UserInfo struct {
 	// UserID is the user's API ID.
 	UserID string
@ -71,10 +65,10 @@ type UserInfo struct {
 	BridgePass []byte
 	// UsedSpace is the amount of space used by the user.
-	UsedSpace uint64
+	UsedSpace int
 	// MaxSpace is the total amount of space available to the user.
-	MaxSpace uint64
+	MaxSpace int
 }
 // GetUserIDs returns the IDs of all known users (authorized or not).
@ -124,28 +118,23 @@ func (bridge *Bridge) QueryUserInfo(query string) (UserInfo, error) {
 }
 // LoginAuth begins the login process. It returns an authorized client that might need 2FA.
-func (bridge *Bridge) LoginAuth(ctx context.Context, username string, password []byte, hvDetails *proton.APIHVDetails) (*proton.Client, proton.Auth, error) {
+func (bridge *Bridge) LoginAuth(ctx context.Context, username string, password []byte) (*proton.Client, proton.Auth, error) {
-	logUser.WithField("username", logging.Sensitive(username)).Info("Authorizing user for login")
+	logrus.WithField("username", logging.Sensitive(username)).Info("Authorizing user for login")
 	if username == "crash@bandicoot" {
 		panic("Your wish is my command.. I crash!")
 	}
 	client, auth, err := bridge.api.NewClientWithLoginWithHVToken(ctx, username, password, hvDetails)
 	if err != nil {
 		if hv.IsHvRequest(err) {
 			logUser.WithFields(logrus.Fields{"username": logging.Sensitive(username),
 				"loginError": err.Error()}).Info("Human Verification requested for login")
 			return nil, proton.Auth{}, err
 		}
 	client, auth, err := bridge.api.NewClientWithLogin(ctx, username, password)
 	if err != nil {
 		return nil, proton.Auth{}, fmt.Errorf("failed to create new API client: %w", err)
 	}
 	if ok := safe.RLockRet(func() bool { return mapHas(bridge.users, auth.UserID) }, bridge.usersLock); ok {
-		logUser.WithField("userID", auth.UserID).Warn("User already logged in")
+		logrus.WithField("userID", auth.UserID).Warn("User already logged in")
 		if err := client.AuthDelete(ctx); err != nil {
-			logUser.WithError(err).Warn("Failed to delete auth")
+			logrus.WithError(err).Warn("Failed to delete auth")
 		}
 		return nil, proton.Auth{}, ErrUserAlreadyLoggedIn
@ -160,23 +149,18 @@ func (bridge *Bridge) LoginUser(
 	client *proton.Client,
 	auth proton.Auth,
 	keyPass []byte,
 	hvDetails *proton.APIHVDetails,
 ) (string, error) {
-	logUser.WithField("userID", auth.UserID).Info("Logging in authorized user")
+	logrus.WithField("userID", auth.UserID).Info("Logging in authorized user")
 	userID, err := try.CatchVal(
 		func() (string, error) {
-			return bridge.loginUser(ctx, client, auth.UID, auth.RefreshToken, keyPass, hvDetails)
+			return bridge.loginUser(ctx, client, auth.UID, auth.RefreshToken, keyPass)
 		},
 		func() error {
 			return client.AuthDelete(ctx)
 		},
 	)
 	if err != nil {
 		// Failure to unlock will allow retries, so we do not delete auth.
 		if !errors.Is(err, ErrFailedToUnlock) {
 			if deleteErr := client.AuthDelete(ctx); deleteErr != nil {
 				logUser.WithError(deleteErr).Error("Failed to delete auth")
 			}
 		}
 		return "", fmt.Errorf("failed to login user: %w", err)
 	}
@ -197,16 +181,15 @@ func (bridge *Bridge) LoginFull(
 	getTOTP func() (string, error),
 	getKeyPass func() ([]byte, error),
 ) (string, error) {
-	logUser.WithField("username", logging.Sensitive(username)).Info("Performing full user login")
+	logrus.WithField("username", logging.Sensitive(username)).Info("Performing full user login")
-	// (atanas) the following may need to be modified once HV is merged (its used only for testing; and depends on whether we will test HV related logic)
+	client, auth, err := bridge.LoginAuth(ctx, username, password)
 	client, auth, err := bridge.LoginAuth(ctx, username, password, nil)
 	if err != nil {
 		return "", fmt.Errorf("failed to begin login process: %w", err)
 	}
 	if auth.TwoFA.Enabled&proton.HasTOTP != 0 {
-		logUser.WithField("userID", auth.UserID).Info("Requesting TOTP")
+		logrus.WithField("userID", auth.UserID).Info("Requesting TOTP")
 		totp, err := getTOTP()
 		if err != nil {
@ -221,7 +204,7 @@ func (bridge *Bridge) LoginFull(
 	var keyPass []byte
 	if auth.PasswordMode == proton.TwoPasswordMode {
-		logUser.WithField("userID", auth.UserID).Info("Requesting mailbox password")
+		logrus.WithField("userID", auth.UserID).Info("Requesting mailbox password")
 		userKeyPass, err := getKeyPass()
 		if err != nil {
@ -233,21 +216,12 @@ func (bridge *Bridge) LoginFull(
 		keyPass = password
 	}
-	userID, err := bridge.LoginUser(ctx, client, auth, keyPass, nil)
+	return bridge.LoginUser(ctx, client, auth, keyPass)
 	if err != nil {
 		if deleteErr := client.AuthDelete(ctx); deleteErr != nil {
 			logUser.WithError(err).Error("Failed to delete auth")
 		}
 		return "", err
 	}
 	return userID, nil
 }
 // LogoutUser logs out the given user.
 func (bridge *Bridge) LogoutUser(ctx context.Context, userID string) error {
-	logUser.WithField("userID", userID).Info("Logging out user")
+	logrus.WithField("userID", userID).Info("Logging out user")
 	return safe.LockRet(func() error {
 		user, ok := bridge.users[userID]
@ -267,12 +241,7 @@ func (bridge *Bridge) LogoutUser(ctx context.Context, userID string) error {
 // DeleteUser deletes the given user.
 func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
-	logUser.WithField("userID", userID).Info("Deleting user")
+	logrus.WithField("userID", userID).Info("Deleting user")
 	syncConfigDir, err := bridge.locator.ProvideIMAPSyncConfigPath()
 	if err != nil {
 		return fmt.Errorf("failed to get sync config path")
 	}
 	return safe.LockRet(func() error {
 		if !bridge.vault.HasUser(userID) {
@ -283,12 +252,8 @@ func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
 			bridge.logoutUser(ctx, user, true, true, !bridge.GetTelemetryDisabled())
 		}
 		if err := imapservice.DeleteSyncState(syncConfigDir, userID); err != nil {
 			return fmt.Errorf("failed to delete use sync config")
 		}
 		if err := bridge.vault.DeleteUser(userID); err != nil {
-			logUser.WithError(err).Error("Failed to delete vault user")
+			logrus.WithError(err).Error("Failed to delete vault user")
 		}
 		bridge.publish(events.UserDeleted{
@ -301,7 +266,7 @@ func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
 // SetAddressMode sets the address mode for the given user.
 func (bridge *Bridge) SetAddressMode(ctx context.Context, userID string, mode vault.AddressMode) error {
-	logUser.WithField("userID", userID).WithField("mode", mode).Info("Setting address mode")
+	logrus.WithField("userID", userID).WithField("mode", mode).Info("Setting address mode")
 	return safe.RLockRet(func() error {
 		user, ok := bridge.users[userID]
@ -313,10 +278,18 @@ func (bridge *Bridge) SetAddressMode(ctx context.Context, userID string, mode va
 			return fmt.Errorf("address mode is already %q", mode)
 		}
 		if err := bridge.removeIMAPUser(ctx, user, true); err != nil {
 			return fmt.Errorf("failed to remove IMAP user: %w", err)
 		}
 		if err := user.SetAddressMode(ctx, mode); err != nil {
 			return fmt.Errorf("failed to set address mode: %w", err)
 		}
 		if err := bridge.addIMAPUser(ctx, user); err != nil {
 			return fmt.Errorf("failed to add IMAP user: %w", err)
 		}
 		bridge.publish(events.AddressModeChanged{
 			UserID:      userID,
 			AddressMode: mode,
@ -337,9 +310,9 @@ func (bridge *Bridge) SetAddressMode(ctx context.Context, userID string, mode va
 // SendBadEventUserFeedback passes the feedback to the given user.
 func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string, doResync bool) error {
-	logUser.WithField("userID", userID).WithField("doResync", doResync).Info("Passing bad event feedback to user")
+	logrus.WithField("userID", userID).WithField("doResync", doResync).Info("Passing bad event feedback to user")
-	return safe.RLockRet(func() error {
+	return safe.LockRet(func() error {
 		ctx := context.Background()
 		user, ok := bridge.users[userID]
@ -348,7 +321,7 @@ func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string,
 				"Failed to handle event: feedback failed: no such user",
 				reporter.Context{"user_id": userID},
 			); rerr != nil {
-				logUser.WithError(rerr).Error("Failed to report feedback failure")
+				logrus.WithError(rerr).Error("Failed to report feedback failure")
 			}
 			return ErrNoSuchUser
@ -359,17 +332,23 @@ func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string,
 				"Failed to handle event: feedback resync",
 				reporter.Context{"user_id": userID},
 			); rerr != nil {
-				logUser.WithError(rerr).Error("Failed to report feedback failure")
+				logrus.WithError(rerr).Error("Failed to report feedback failure")
 			}
-			return user.BadEventFeedbackResync(ctx)
+			if err := bridge.addIMAPUser(ctx, user); err != nil {
 				return fmt.Errorf("failed to add IMAP user: %w", err)
 			}
 			user.BadEventFeedbackResync(ctx)
 			return nil
 		}
 		if rerr := bridge.reporter.ReportMessageWithContext(
 			"Failed to handle event: feedback logout",
 			reporter.Context{"user_id": userID},
 		); rerr != nil {
-			logUser.WithError(rerr).Error("Failed to report feedback failure")
+			logrus.WithError(rerr).Error("Failed to report feedback failure")
 		}
 		bridge.logoutUser(ctx, user, true, false, false)
@ -382,8 +361,8 @@ func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string,
 	}, bridge.usersLock)
 }
-func (bridge *Bridge) loginUser(ctx context.Context, client *proton.Client, authUID, authRef string, keyPass []byte, hvDetails *proton.APIHVDetails) (string, error) {
+func (bridge *Bridge) loginUser(ctx context.Context, client *proton.Client, authUID, authRef string, keyPass []byte) (string, error) {
-	apiUser, err := client.GetUserWithHV(ctx, hvDetails)
+	apiUser, err := client.GetUser(ctx)
 	if err != nil {
 		return "", fmt.Errorf("failed to get API user: %w", err)
 	}
@ -399,9 +378,9 @@ func (bridge *Bridge) loginUser(ctx context.Context, client *proton.Client, auth
 	}
 	if userKR, err := apiUser.Keys.Unlock(saltedKeyPass, nil); err != nil {
-		return "", fmt.Errorf("%w: %w", ErrFailedToUnlock, err)
+		return "", fmt.Errorf("failed to unlock user keys: %w", err)
 	} else if userKR.CountDecryptionEntities() == 0 {
-		return "", ErrFailedToUnlock
+		return "", fmt.Errorf("failed to unlock user keys")
 	}
 	if err := bridge.addUser(ctx, client, apiUser, authUID, authRef, saltedKeyPass, true); err != nil {
@ -413,11 +392,11 @@ func (bridge *Bridge) loginUser(ctx context.Context, client *proton.Client, auth
 // loadUsers tries to load each user in the vault that isn't already loaded.
 func (bridge *Bridge) loadUsers(ctx context.Context) error {
-	logUser.WithField("count", len(bridge.vault.GetUserIDs())).Info("Loading users")
+	logrus.WithField("count", len(bridge.vault.GetUserIDs())).Info("Loading users")
-	defer logUser.Info("Finished loading users")
+	defer logrus.Info("Finished loading users")
 	return bridge.vault.ForUser(runtime.NumCPU(), func(user *vault.User) error {
-		log := logUser.WithField("userID", user.UserID())
+		log := logrus.WithField("userID", user.UserID())
 		if user.AuthUID() == "" {
 			log.Info("User is not connected (skipping)")
@ -461,7 +440,7 @@ func (bridge *Bridge) loadUser(ctx context.Context, user *vault.User) error {
 		if apiErr := new(proton.APIError); errors.As(err, &apiErr) && (apiErr.Code == proton.AuthRefreshTokenInvalid) {
 			// The session cannot be refreshed, we sign out the user by clearing his auth secrets.
 			if err := user.Clear(); err != nil {
-				logUser.WithError(err).Warn("Failed to clear user secrets")
+				logrus.WithError(err).Warn("Failed to clear user secrets")
 			}
 		}
@ -504,26 +483,26 @@ func (bridge *Bridge) addUser(
 		return fmt.Errorf("failed to add vault user: %w", err)
 	}
-	if err := bridge.addUserWithVault(ctx, client, apiUser, vaultUser, isNew); err != nil {
+	if err := bridge.addUserWithVault(ctx, client, apiUser, vaultUser); err != nil {
 		if _, ok := err.(*resty.ResponseError); ok || isLogin {
-			logUser.WithError(err).Error("Failed to add user, clearing its secrets from vault")
+			logrus.WithError(err).Error("Failed to add user, clearing its secrets from vault")
 			if err := vaultUser.Clear(); err != nil {
-				logUser.WithError(err).Error("Failed to clear user secrets")
+				logrus.WithError(err).Error("Failed to clear user secrets")
 			}
 		} else {
-			logUser.WithError(err).Error("Failed to add user")
+			logrus.WithError(err).Error("Failed to add user")
 		}
 		if err := vaultUser.Close(); err != nil {
-			logUser.WithError(err).Error("Failed to close vault user")
+			logrus.WithError(err).Error("Failed to close vault user")
 		}
 		if isNew {
-			logUser.Warn("Deleting newly added vault user")
+			logrus.Warn("Deleting newly added vault user")
 			if err := bridge.vault.DeleteUser(apiUser.ID); err != nil {
-				logUser.WithError(err).Error("Failed to delete vault user")
+				logrus.WithError(err).Error("Failed to delete vault user")
 			}
 		}
@ -539,17 +518,14 @@ func (bridge *Bridge) addUserWithVault(
 	client *proton.Client,
 	apiUser proton.User,
 	vault *vault.User,
 	isNew bool,
 ) error {
 	statsPath, err := bridge.locator.ProvideStatsPath()
 	if err != nil {
 		return fmt.Errorf("failed to get Statistics directory: %w", err)
 	}
-	syncSettingsPath, err := bridge.locator.ProvideIMAPSyncConfigPath()
+	// re-set SyncStatus if database need to be re-synced for migration.
-	if err != nil {
+	bridge.migrateUser(vault)
 		return fmt.Errorf("failed to get IMAP sync config path: %w", err)
 	}
 	user, err := user.New(
 		ctx,
@ -562,28 +538,30 @@ func (bridge *Bridge) addUserWithVault(
 		bridge.vault.GetMaxSyncMemory(),
 		statsPath,
 		bridge,
 		bridge.serverManager,
 		bridge.serverManager,
 		&bridgeEventSubscription{b: bridge},
 		bridge.syncService,
 		syncSettingsPath,
 		isNew,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create user: %w", err)
 	}
 	// Connect the user's address(es) to gluon.
 	if err := bridge.addIMAPUser(ctx, user); err != nil {
 		return fmt.Errorf("failed to add IMAP user: %w", err)
 	}
 	// Handle events coming from the user before forwarding them to the bridge.
 	// For example, if the user's addresses change, we need to update them in gluon.
 	bridge.tasks.Once(func(ctx context.Context) {
 		async.RangeContext(ctx, user.GetEventCh(), func(event events.Event) {
-			logUser.WithFields(logrus.Fields{
+			logrus.WithFields(logrus.Fields{
 				"userID": apiUser.ID,
 				"event":  event,
 			}).Debug("Received user event")
-			bridge.handleUserEvent(ctx, user, event)
+			if err := bridge.handleUserEvent(ctx, user, event); err != nil {
-			bridge.publish(event)
+				logrus.WithError(err).Error("Failed to handle user event")
 			} else {
 				bridge.publish(event)
 			}
 		})
 	})
@ -604,9 +582,7 @@ func (bridge *Bridge) addUserWithVault(
 	}, bridge.usersLock)
 	// As we need at least one user to send heartbeat, try to send it.
-	bridge.heartbeat.start()
+	defer bridge.goHeartbeat()
 	user.PublishEvent(ctx, events.UserLoadedCheckResync{UserID: user.ID()})
 	return nil
 }
@ -630,14 +606,18 @@ func (bridge *Bridge) logoutUser(ctx context.Context, user *user.User, withAPI,
 		user.SendConfigStatusAbort(ctx, withTelemetry)
 	}
-	logUser.WithFields(logrus.Fields{
+	logrus.WithFields(logrus.Fields{
 		"userID":   user.ID(),
 		"withAPI":  withAPI,
 		"withData": withData,
 	}).Debug("Logging out user")
 	if err := bridge.removeIMAPUser(ctx, user, withData); err != nil {
 		logrus.WithError(err).Error("Failed to remove IMAP user")
 	}
 	if err := user.Logout(ctx, withAPI); err != nil {
-		logUser.WithError(err).Error("Failed to logout user")
+		logrus.WithError(err).Error("Failed to logout user")
 	}
 	bridge.heartbeat.SetNbAccount(len(bridge.users))
--- a/internal/bridge/user_event_test.go
+++ b/internal/bridge/user_event_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -139,6 +139,9 @@ func test_badMessage_badEvent(userFeedback func(t *testing.T, ctx context.Contex
 			})
 			withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 				smtpWaiter := waitForSMTPServerReady(bridge)
 				defer smtpWaiter.Done()
 				userLoginAndSync(ctx, t, bridge, "user", password)
 				var messageIDs []string
@ -174,6 +177,8 @@ func test_badMessage_badEvent(userFeedback func(t *testing.T, ctx context.Contex
 				userFeedback(t, ctx, bridge, badUserID)
 				smtpWaiter.Wait()
 				userContinueEventProcess(ctx, t, s, bridge)
 			})
 		})
@ -192,6 +197,9 @@ func TestBridge_User_BadMessage_NoBadEvent(t *testing.T) {
 		})
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			userLoginAndSync(ctx, t, bridge, "user", password)
 			var messageIDs []string
@ -215,6 +223,7 @@ func TestBridge_User_BadMessage_NoBadEvent(t *testing.T) {
 				require.NoError(t, c.DeleteMessage(ctx, messageIDs...))
 			})
 			smtpWaiter.Wait()
 			userContinueEventProcess(ctx, t, s, bridge)
 		})
 	})
@ -767,11 +776,20 @@ func TestBridge_User_CreateDisabledAddress(t *testing.T) {
 func TestBridge_User_HandleParentLabelRename(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
 		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
 			imapWaiter := waitForIMAPServerReady(bridge)
 			defer imapWaiter.Done()
 			smtpWaiter := waitForSMTPServerReady(bridge)
 			defer smtpWaiter.Done()
 			require.NoError(t, getErr(bridge.LoginFull(ctx, username, password, nil, nil)))
 			info, err := bridge.QueryUserInfo(username)
 			require.NoError(t, err)
 			imapWaiter.Wait()
 			smtpWaiter.Wait()
 			cli, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
 			require.NoError(t, err)
 			require.NoError(t, cli.Login(info.Addresses[0], string(info.BridgePass)))
--- a/internal/bridge/user_events.go
+++ b/internal/bridge/user_events.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -19,29 +19,149 @@ package bridge
 import (
 	"context"
 	"fmt"
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/proton-bridge/v3/internal"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v3/internal/user"
 	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 )
-func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, event events.Event) {
+func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, event events.Event) error {
 	switch event := event.(type) {
 	case events.UserAddressCreated:
 		if err := bridge.handleUserAddressCreated(ctx, user, event); err != nil {
 			return fmt.Errorf("failed to handle user address created event: %w", err)
 		}
 	case events.UserAddressEnabled:
 		if err := bridge.handleUserAddressEnabled(ctx, user, event); err != nil {
 			return fmt.Errorf("failed to handle user address enabled event: %w", err)
 		}
 	case events.UserAddressDisabled:
 		if err := bridge.handleUserAddressDisabled(ctx, user, event); err != nil {
 			return fmt.Errorf("failed to handle user address disabled event: %w", err)
 		}
 	case events.UserAddressDeleted:
 		if err := bridge.handleUserAddressDeleted(ctx, user, event); err != nil {
 			return fmt.Errorf("failed to handle user address deleted event: %w", err)
 		}
 	case events.UserRefreshed:
 		if err := bridge.handleUserRefreshed(ctx, user, event); err != nil {
 			return fmt.Errorf("failed to handle user refreshed event: %w", err)
 		}
 	case events.UserDeauth:
 		bridge.handleUserDeauth(ctx, user)
 	case events.UserBadEvent:
 		bridge.handleUserBadEvent(ctx, user, event)
 	case events.UserLoadedCheckResync:
 		user.VerifyResyncAndExecute()
 	case events.UncategorizedEventError:
 		bridge.handleUncategorizedErrorEvent(event)
 	}
 	return nil
 }
 func (bridge *Bridge) handleUserAddressCreated(ctx context.Context, user *user.User, event events.UserAddressCreated) error {
 	if user.GetAddressMode() == vault.CombinedMode {
 		return nil
 	}
 	gluonID, err := bridge.serverManager.AddGluonUser(ctx, user.NewIMAPConnector(event.AddressID), user.GluonKey())
 	if err != nil {
 		return fmt.Errorf("failed to add user to IMAP server: %w", err)
 	}
 	if err := user.SetGluonID(event.AddressID, gluonID); err != nil {
 		return fmt.Errorf("failed to set gluon ID: %w", err)
 	}
 	return nil
 }
 func (bridge *Bridge) handleUserAddressEnabled(ctx context.Context, user *user.User, event events.UserAddressEnabled) error {
 	if user.GetAddressMode() == vault.CombinedMode {
 		return nil
 	}
 	gluonID, err := bridge.serverManager.AddGluonUser(ctx, user.NewIMAPConnector(event.AddressID), user.GluonKey())
 	if err != nil {
 		return fmt.Errorf("failed to add user to IMAP server: %w", err)
 	}
 	if err := user.SetGluonID(event.AddressID, gluonID); err != nil {
 		return fmt.Errorf("failed to set gluon ID: %w", err)
 	}
 	return nil
 }
 func (bridge *Bridge) handleUserAddressDisabled(ctx context.Context, user *user.User, event events.UserAddressDisabled) error {
 	if user.GetAddressMode() == vault.CombinedMode {
 		return nil
 	}
 	gluonID, ok := user.GetGluonID(event.AddressID)
 	if !ok {
 		return fmt.Errorf("gluon ID not found for address %s", event.AddressID)
 	}
 	if err := bridge.serverManager.RemoveGluonUser(ctx, gluonID); err != nil {
 		return fmt.Errorf("failed to remove user from IMAP server: %w", err)
 	}
 	if err := user.RemoveGluonID(event.AddressID, gluonID); err != nil {
 		return fmt.Errorf("failed to remove gluon ID for address: %w", err)
 	}
 	return nil
 }
 func (bridge *Bridge) handleUserAddressDeleted(ctx context.Context, user *user.User, event events.UserAddressDeleted) error {
 	if user.GetAddressMode() == vault.CombinedMode {
 		return nil
 	}
 	gluonID, ok := user.GetGluonID(event.AddressID)
 	if !ok {
 		return fmt.Errorf("gluon ID not found for address %s", event.AddressID)
 	}
 	if err := bridge.serverManager.handleRemoveGluonUser(ctx, gluonID); err != nil {
 		return fmt.Errorf("failed to remove user from IMAP server: %w", err)
 	}
 	if err := user.RemoveGluonID(event.AddressID, gluonID); err != nil {
 		return fmt.Errorf("failed to remove gluon ID for address: %w", err)
 	}
 	return nil
 }
 func (bridge *Bridge) handleUserRefreshed(ctx context.Context, user *user.User, event events.UserRefreshed) error {
 	return safe.RLockRet(func() error {
 		if event.CancelEventPool {
 			user.CancelSyncAndEventPoll()
 		}
 		if err := bridge.removeIMAPUser(ctx, user, true); err != nil {
 			return fmt.Errorf("failed to remove IMAP user: %w", err)
 		}
 		if err := bridge.addIMAPUser(ctx, user); err != nil {
 			return fmt.Errorf("failed to add IMAP user: %w", err)
 		}
 		return nil
 	}, bridge.usersLock)
 }
 func (bridge *Bridge) handleUserDeauth(ctx context.Context, user *user.User) {
@ -51,8 +171,8 @@ func (bridge *Bridge) handleUserDeauth(ctx context.Context, user *user.User) {
 	}, bridge.usersLock)
 }
-func (bridge *Bridge) handleUserBadEvent(ctx context.Context, user *user.User, event events.UserBadEvent) {
+func (bridge *Bridge) handleUserBadEvent(_ context.Context, user *user.User, event events.UserBadEvent) {
-	safe.RLock(func() {
+	safe.Lock(func() {
 		if rerr := bridge.reporter.ReportMessageWithContext("Failed to handle event", reporter.Context{
 			"user_id":      user.ID(),
 			"old_event_id": event.OldEventID,
@ -61,10 +181,15 @@ func (bridge *Bridge) handleUserBadEvent(ctx context.Context, user *user.User, e
 			"error":        event.Error,
 			"error_type":   internal.ErrCauseType(event.Error),
 		}); rerr != nil {
-			logrus.WithField("pkg", "bridge/event").WithError(rerr).Error("Failed to report failed event handling")
+			logrus.WithError(rerr).Error("Failed to report failed event handling")
 		}
-		user.OnBadEvent(ctx)
+		user.CancelSyncAndEventPoll()
 		// Disable IMAP user
 		if err := bridge.removeIMAPUser(context.Background(), user, false); err != nil {
 			logrus.WithError(err).Error("Failed to remove IMAP user")
 		}
 	}, bridge.usersLock)
 }
@ -73,6 +198,6 @@ func (bridge *Bridge) handleUncategorizedErrorEvent(event events.UncategorizedEv
 		"error_type": internal.ErrCauseType(event.Error),
 		"error":      event.Error,
 	}); rerr != nil {
-		logrus.WithField("pkg", "bridge/event").WithError(rerr).Error("Failed to report failed event handling")
+		logrus.WithError(rerr).Error("Failed to report failed event handling")
 	}
 }
--- a/internal/bridge/user_test.go
+++ b/internal/bridge/user_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/certs/cert_store_darwin.go
+++ b/internal/certs/cert_store_darwin.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -23,200 +23,71 @@ package certs
 #import <Foundation/Foundation.h>
 #import <Security/Security.h>
 // Memory management rules:
 // Foundation object (Objective-C prefixed with `NS`) get ARC (Automatic Reference Counting), and do not need to be released manually.
 // Core Foundation objects (C), prefixed with need to be released manually using CFRelease() unless:
 // - They're obtained using a CF method containing the word Get (a.k.a. the Get Rule).
 // - They're obtained using toll-free bridging from a Foundation Object (using the __bridge keyword).
-//****************************************************************************************************************************************************
+int installTrustedCert(char const *bytes, unsigned long long length) {
-/// \brief Create a certificate object from DER-encoded data.
+	if (length == 0) {
-///
+		return errSecInvalidData;
-/// \return The certifcation. The caller is responsible for releasing the object using CFRelease.
+	}
-/// \return NULL if data is not a valid DER-encoded certificate.
+
-//****************************************************************************************************************************************************
+	NSData *der = [NSData dataWithBytes:bytes length:length];
-SecCertificateRef certFromData(char const* data, uint64_t length) {
+
-    NSData *der = [NSData dataWithBytes:data length:length];
+	// Step 1. Import the certificate in the keychain.
-    return SecCertificateCreateWithData(NULL, (__bridge CFDataRef)der);
+	SecCertificateRef cert = SecCertificateCreateWithData(NULL, (CFDataRef) der);
 	NSDictionary* addQuery = @{
 		(id)kSecValueRef: (__bridge id) cert,
 		(id)kSecClass: (id)kSecClassCertificate,
 	};
 	OSStatus status = SecItemAdd((__bridge CFDictionaryRef) addQuery, NULL);
 	if ((errSecSuccess != status) && (errSecDuplicateItem != status)) {
 		CFRelease(cert);
 		return status;
 	}
 	// Step 2. Set the trust for the certificate.
 	SecPolicyRef policy = SecPolicyCreateSSL(true, NULL); // we limit our trust to SSL
 	NSDictionary *trustSettings = @{
 		(id)kSecTrustSettingsResult: [NSNumber numberWithInt:kSecTrustSettingsResultTrustRoot],
 		(id)kSecTrustSettingsPolicy: (__bridge id) policy,
 	};
 	status = SecTrustSettingsSetTrustSettings(cert, kSecTrustSettingsDomainUser, (__bridge CFTypeRef)(trustSettings));
 	CFRelease(policy);
 	CFRelease(cert);
 	return status;
 }
-//****************************************************************************************************************************************************
+int removeTrustedCert(char const *bytes, unsigned long long length) {
-/// \brief Check if a certificate is in the user's keychain.
+	if (0 == length) {
-///
+		return errSecInvalidData;
-/// \param[in] cert The certificate.
+	}
 /// \return true iff the certificate is in the user's keychain.
 //****************************************************************************************************************************************************
 bool _isCertificateInKeychain(SecCertificateRef const cert) {
    NSDictionary *attrs = @{
        (id)kSecMatchItemList: @[(__bridge id)cert],
        (id)kSecClass: (id)kSecClassCertificate,
        (id)kSecReturnData: @YES
    };
    return errSecSuccess == SecItemCopyMatching((__bridge CFDictionaryRef)attrs, NULL);
 }
-//****************************************************************************************************************************************************
+	NSData *der = [NSData dataWithBytes: bytes length: length];
-/// \brief Check if a certificate is in the user's keychain.
+	SecCertificateRef cert = SecCertificateCreateWithData(NULL, (CFDataRef) der);
 ///
 /// \param[in] certData The certificate data in DER encoded format.
 /// \param[in] certSize The size of the certData in bytes.
 /// \return true iff the certificate is in the user's keychain.
 //****************************************************************************************************************************************************
 bool isCertificateInKeychain(char const* certData, uint64_t certSize) {
    return _isCertificateInKeychain(certFromData(certData, certSize));
 }
 	// Step 1. Unset the trust for the certificate.
 	SecPolicyRef policy = SecPolicyCreateSSL(true, NULL);
 	NSDictionary * trustSettings = @{
 		(id)kSecTrustSettingsResult: [NSNumber numberWithInt:kSecTrustSettingsResultUnspecified],
 		(id)kSecTrustSettingsPolicy: (__bridge id) policy,
 	};
 	OSStatus status = SecTrustSettingsSetTrustSettings(cert, kSecTrustSettingsDomainUser, (__bridge CFTypeRef)(trustSettings));
 	CFRelease(policy);
 	if (errSecSuccess != status) {
 		CFRelease(cert);
 		return status;
 	}
-//****************************************************************************************************************************************************
+	// Step 2. Remove the certificate from the keychain.
-/// \brief Add a certificate to the user's keychain.
+	NSDictionary *query = @{ (id)kSecClass: (id)kSecClassCertificate,
-///
+							 (id)kSecMatchItemList: @[(__bridge id)cert],
-/// \param[in] cert The certificate.
+							 (id)kSecMatchLimit: (id)kSecMatchLimitOne,
-/// \return The status for the operation.
+						   };
-//****************************************************************************************************************************************************
+	status = SecItemDelete((__bridge CFDictionaryRef) query);
 OSStatus _addCertificateToKeychain(SecCertificateRef const cert) {
    NSDictionary* addQuery = @{
        (id)kSecValueRef: (__bridge id) cert,
        (id)kSecClass: (id)kSecClassCertificate,
    };
    return SecItemAdd((__bridge CFDictionaryRef) addQuery, NULL);
 }
-//****************************************************************************************************************************************************
+	CFRelease(cert);
-/// \brief Add a certificate to the user's keychain.
+	return status;
 ///
 /// \param[in] certData The certificate data in DER encoded format.
 /// \param[in] certSize The size of the certData in bytes.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus addCertificateToKeychain(char const* certData, uint64_t certSize) {
    return _addCertificateToKeychain(certFromData(certData, certSize));
 }
 //****************************************************************************************************************************************************
 /// \brief Add a certificate to the user's keychain.
 ///
 /// \param[in] cert The certificate.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus _removeCertificateFromKeychain(SecCertificateRef const cert) {
        NSDictionary *query = @{ (id)kSecClass: (id)kSecClassCertificate,
                                 (id)kSecMatchItemList: @[(__bridge id)cert],
                                 (id)kSecMatchLimit: (id)kSecMatchLimitOne,
        };
        return SecItemDelete((__bridge CFDictionaryRef) query);
 }
 //****************************************************************************************************************************************************
 /// \brief Add a certificate to the user's keychain.
 ///
 /// \param[in] certData The certificate data in DER encoded format.
 /// \param[in] certSize The size of the certData in bytes.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus removeCertificateFromKeychain(char const* certData, uint64_t certSize) {
    return _removeCertificateFromKeychain(certFromData(certData, certSize));
 }
 //****************************************************************************************************************************************************
 /// \brief Check if a certificate is trusted in the user's keychain.
 ///
 /// \param[in] cert The certificate.
 /// \return true iff the certificate is trusted in the user's keychain.
 //****************************************************************************************************************************************************
 bool _isCertificateTrusted(SecCertificateRef const cert) {
    CFArrayRef trustSettings = NULL;
    OSStatus status = SecTrustSettingsCopyTrustSettings(cert, kSecTrustSettingsDomainUser, &trustSettings);
    if (status != errSecSuccess) {
        return false;
    }
    CFIndex count = CFArrayGetCount(trustSettings);
    bool result = false;
    for (CFIndex index = 0; index < count; ++index) {
        CFDictionaryRef dict = (CFDictionaryRef)CFArrayGetValueAtIndex(trustSettings, index);
        if (!dict) {
            continue;
        }
        CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(dict, kSecTrustSettingsResult);
        int value;
        if (num && CFNumberGetValue(num, kCFNumberSInt32Type, &value) && (value == kSecTrustSettingsResultTrustRoot)) {
            result = true;
            break;
        }
    }
    CFRelease(trustSettings);
    return result;
 }
 //****************************************************************************************************************************************************
 /// \brief Check if a certificate is trusted in the user's keychain.
 ///
 /// \param[in] certData The certificate data in DER encoded format.
 /// \param[in] certSize The size of the certData in bytes.
 /// \return true iff the certificate is trusted in the user's keychain.
 //****************************************************************************************************************************************************
 bool isCertificateTrusted(char const* certData, uint64_t certSize) {
    return _isCertificateTrusted(certFromData(certData, certSize));
 }
 //****************************************************************************************************************************************************
 /// \brief Set the trust level for a certificate in the user's keychain. This call will trigger a security prompt.
 ///
 /// \param[in] cert The certificate.
 /// \param[in] trustLevel The trust level.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus _setCertificateTrustLevel(SecCertificateRef const cert, int trustLevel) {
    SecPolicyRef policy = SecPolicyCreateSSL(true, NULL); // we limit our trust to SSL
    NSDictionary *trustSettings = @{
        (id)kSecTrustSettingsResult: [NSNumber numberWithInt:trustLevel],
        (id)kSecTrustSettingsPolicy: (__bridge id) policy,
    };
    OSStatus status = SecTrustSettingsSetTrustSettings(cert, kSecTrustSettingsDomainUser, (__bridge CFTypeRef)(trustSettings));
    CFRelease(policy);
    return status;
 }
 //****************************************************************************************************************************************************
 /// \brief Set a certificate as trusted in the user's keychain. This call will trigger a security prompt.
 ///
 /// \param[in] cert The certificate.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus _setCertificateTrusted(SecCertificateRef cert) {
    return _setCertificateTrustLevel(cert, kSecTrustSettingsResultTrustRoot);
 }
 //****************************************************************************************************************************************************
 /// \brief Set a certificate as trusted in the user's keychain. This call will trigger a security prompt.
 ///
 /// \param[in] certData The certificate data in DER encoded format.
 /// \param[in] certSize The size of the certData in bytes.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus setCertificateTrusted(char const* certData, uint64_t certSize) {
    return _setCertificateTrusted(certFromData(certData, certSize));
 }
 //****************************************************************************************************************************************************
 /// \brief Remove the trust level of a certificate in the user's keychain.
 ///
 /// \param[in] cert The certificate.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus _removeCertificateTrust(SecCertificateRef cert) {
    return _setCertificateTrustLevel(cert, kSecTrustSettingsResultUnspecified);
 }
 //****************************************************************************************************************************************************
 /// \brief Remove the trust level of a certificate in the user's keychain.
 ///
 /// \param[in] certData The certificate data in DER encoded format.
 /// \param[in] certSize The size of the certData in bytes.
 /// \return The status for the operation.
 //****************************************************************************************************************************************************
 OSStatus removeCertificateTrust(char const* certData, uint64_t certSize) {
    return _removeCertificateTrust(certFromData(certData, certSize));
 }
 */
 import "C"
@ -248,120 +119,6 @@ func certPEMToDER(certPEM []byte) ([]byte, error) {
 	return block.Bytes, nil
 }
 // wrapCGoCertCallReturningBool wrap call to a CGo function returning a bool.
 // if the certificate is invalid the call will return false.
 func wrapCGoCertCallReturningBool(certPEM []byte, fn func(*C.char, C.ulonglong) bool) bool {
 	certDER, err := certPEMToDER(certPEM)
 	if err != nil {
 		return false // error are ignored
 	}
 	buffer := C.CBytes(certDER)
 	defer C.free(unsafe.Pointer(buffer)) //nolint:unconvert
 	return fn((*C.char)(buffer), C.ulonglong(len(certDER)))
 }
 // wrapCGoCertCallReturningBool wrap call to a CGo function returning an error
 func wrapCGoCertCallReturningError(certPEM []byte, fn func(*C.char, C.ulonglong) error) error {
 	certDER, err := certPEMToDER(certPEM)
 	if err != nil {
 		return err
 	}
 	buffer := C.CBytes(certDER)
 	defer C.free(unsafe.Pointer(buffer)) //nolint:unconvert
 	return fn((*C.char)(buffer), C.ulonglong(len(certDER)))
 }
 // isCertInKeychain returns true if the given certificate is stored in the user's keychain.
 func isCertInKeychain(certPEM []byte) bool {
 	return wrapCGoCertCallReturningBool(certPEM, isCertInKeychainCGo)
 }
 func isCertInKeychainCGo(buffer *C.char, size C.ulonglong) bool {
 	return bool(C.isCertificateInKeychain(buffer, size))
 }
 // addCertToKeychain adds a certificate to the user's keychain.
 // Trying to add a certificate that is already in the keychain will result in an error.
 func addCertToKeychain(certPEM []byte) error {
 	return wrapCGoCertCallReturningError(certPEM, addCertToKeychainCGo)
 }
 func addCertToKeychainCGo(buffer *C.char, size C.ulonglong) error {
 	if errCode := C.addCertificateToKeychain(buffer, size); errCode != errSecSuccess {
 		return fmt.Errorf("could not add certificate to keychain (error %v)", errCode)
 	}
 	return nil
 }
 // removeCertFromKeychain removes a certificate from the user's keychain.
 // Trying to remove a certificate that is not in the keychain will result in an error.
 func removeCertFromKeychain(certPEM []byte) error {
 	return wrapCGoCertCallReturningError(certPEM, removeCertFromKeychainCGo)
 }
 func removeCertFromKeychainCGo(buffer *C.char, size C.ulonglong) error {
 	if errCode := C.removeCertificateFromKeychain(buffer, size); errCode != errSecSuccess {
 		return fmt.Errorf("could not remove certificate from keychain (error %v)", errCode)
 	}
 	return nil
 }
 // isCertTrusted check if a certificate is trusted in the user's keychain.
 func isCertTrusted(certPEM []byte) bool {
 	return wrapCGoCertCallReturningBool(certPEM, isCertTrustedCGo)
 }
 func isCertTrustedCGo(buffer *C.char, size C.ulonglong) bool {
 	return bool(C.isCertificateTrusted(buffer, size))
 }
 // setCertTrusted sets a certificate as trusted in the user's keychain.
 // This function will trigger a security prompt from the system.
 func setCertTrusted(certPEM []byte) error {
 	return wrapCGoCertCallReturningError(certPEM, setCertTrustedCGo)
 }
 func setCertTrustedCGo(buffer *C.char, size C.ulonglong) error {
 	errCode := C.setCertificateTrusted(buffer, size)
 	switch errCode {
 	case errSecSuccess:
 		return nil
 	case errAuthorizationCanceled:
 		return ErrUserCanceledCertificateInstall
 	default:
 		return fmt.Errorf("could not set certificate trust in keychain (error %v)", errCode)
 	}
 }
 // removeCertTrust remove the trust level of the certificated from the user's keychain.
 // This function will trigger a security prompt from the system.
 func removeCertTrust(certPEM []byte) error {
 	return wrapCGoCertCallReturningError(certPEM, removeCertTrustCGo)
 }
 func removeCertTrustCGo(buffer *C.char, size C.ulonglong) error {
 	errCode := C.removeCertificateTrust(buffer, size)
 	switch errCode {
 	case errSecSuccess:
 		return nil
 	case errAuthorizationCanceled:
 		return ErrUserCanceledCertificateInstall
 	default:
 		return fmt.Errorf("could not set certificate trust in keychain (error %v)", errCode)
 	}
 }
 func osSupportCertInstall() bool {
 	return true
 }
 // installCert installs a certificate in the keychain. The certificate is added to the keychain and it is set as trusted.
 // This function will trigger a security prompt from the system, unless the certificate is already trusted in the user keychain.
 func installCert(certPEM []byte) error {
 	certDER, err := certPEMToDER(certPEM)
 	if err != nil {
@ -370,24 +127,18 @@ func installCert(certPEM []byte) error {
 	p := C.CBytes(certDER)
 	defer C.free(unsafe.Pointer(p)) //nolint:unconvert
 	buffer := (*C.char)(p)
 	size := C.ulonglong(len(certDER))
-	if !isCertInKeychainCGo(buffer, size) {
+	errCode := C.installTrustedCert((*C.char)(p), (C.ulonglong)(len(certDER)))
-		if err := addCertToKeychainCGo(buffer, size); err != nil {
+	switch errCode {
-			return err
+	case errSecSuccess:
-		}
+		return nil
 	case errAuthorizationCanceled:
 		return fmt.Errorf("the user cancelled the authorization dialog")
 	default:
 		return fmt.Errorf("could not install certification into keychain (error %v)", errCode)
 	}
 	if !isCertTrustedCGo(buffer, size) {
 		return setCertTrustedCGo(buffer, size)
 	}
 	return nil
 }
 // uninstallCert uninstalls a certificate in the keychain. The certificate trust is removed and the certificated is deleted from the keychain.
 // This function will trigger a security prompt from the system, unless the certificate is not trusted in the user keychain.
 func uninstallCert(certPEM []byte) error {
 	certDER, err := certPEMToDER(certPEM)
 	if err != nil {
@ -396,32 +147,10 @@ func uninstallCert(certPEM []byte) error {
 	p := C.CBytes(certDER)
 	defer C.free(unsafe.Pointer(p)) //nolint:unconvert
 	buffer := (*C.char)(p)
 	size := C.ulonglong(len(certDER))
-	if isCertTrustedCGo(buffer, size) {
+	if errCode := C.removeTrustedCert((*C.char)(p), (C.ulonglong)(len(certDER))); errCode != 0 {
-		if err := removeCertTrustCGo(buffer, size); err != nil {
+		return fmt.Errorf("could not install certificate from keychain (error %v)", errCode)
 			return err
 		}
 	}
 	if isCertInKeychainCGo(buffer, size) {
 		return removeCertFromKeychainCGo(buffer, size)
 	}
 	return nil
 }
 func isCertInstalled(certPEM []byte) bool {
 	certDER, err := certPEMToDER(certPEM)
 	if err != nil {
 		return false
 	}
 	p := C.CBytes(certDER)
 	defer C.free(unsafe.Pointer(p)) //nolint:unconvert
 	buffer := (*C.char)(p)
 	size := C.ulonglong(len(certDER))
 	return isCertInKeychainCGo(buffer, size) && isCertTrustedCGo(buffer, size)
 }
--- a/internal/certs/cert_store_darwin_test.go
+++ b/internal/certs/cert_store_darwin_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -25,74 +25,20 @@ import (
 	"github.com/stretchr/testify/require"
 )
-func TestCertInKeychain(t *testing.T) {
+// This test implies human interactions to enter password and is disabled by default.
-	// no trust settings change is performed, so this test will not trigger an OS security prompt.
+func _TestTrustedCertsDarwin(t *testing.T) { //nolint:unused
 	certPEM := generatePEMCertificate(t)
 	require.True(t, osSupportCertInstall())
 	require.False(t, isCertInKeychain(certPEM))
 	require.NoError(t, addCertToKeychain(certPEM))
 	require.True(t, isCertInKeychain(certPEM))
 	require.Error(t, addCertToKeychain(certPEM))
 	require.True(t, isCertInKeychain(certPEM))
 	require.NoError(t, removeCertFromKeychain(certPEM))
 	require.False(t, isCertInKeychain(certPEM))
 	require.Error(t, removeCertFromKeychain(certPEM))
 	require.False(t, isCertInKeychain(certPEM))
 }
 // This test require human interaction (macOS security prompts), and is disabled by default.
 func _TestCertificateTrust(t *testing.T) { //nolint:unused
 	certPEM := generatePEMCertificate(t)
 	require.False(t, isCertTrusted(certPEM))
 	require.NoError(t, addCertToKeychain(certPEM))
 	require.NoError(t, setCertTrusted(certPEM))
 	require.True(t, isCertTrusted(certPEM))
 	require.NoError(t, removeCertTrust(certPEM))
 	require.False(t, isCertTrusted(certPEM))
 	require.NoError(t, removeCertFromKeychain(certPEM))
 }
 // This test require human interaction (macOS security prompts), and is disabled by default.
 func _TestInstallAndRemove(t *testing.T) { //nolint:unused
 	certPEM := generatePEMCertificate(t)
 	// fresh install
 	require.False(t, isCertInstalled(certPEM))
 	require.NoError(t, installCert(certPEM))
 	require.True(t, isCertInKeychain(certPEM))
 	require.True(t, isCertTrusted(certPEM))
 	require.True(t, isCertInstalled(certPEM))
 	require.NoError(t, uninstallCert(certPEM))
 	require.False(t, isCertInKeychain(certPEM))
 	require.False(t, isCertTrusted(certPEM))
 	require.False(t, isCertInstalled(certPEM))
 	// Install where certificate is already in Keychain, but not trusted.
 	require.NoError(t, addCertToKeychain(certPEM))
 	require.False(t, isCertInstalled(certPEM))
 	require.NoError(t, installCert(certPEM))
 	require.True(t, isCertInstalled(certPEM))
 	// Install where certificate is already installed
 	require.NoError(t, installCert(certPEM))
 	// Remove when certificate is not trusted.
 	require.NoError(t, removeCertTrust(certPEM))
 	require.NoError(t, uninstallCert(certPEM))
 	require.False(t, isCertInstalled(certPEM))
 	// Remove when certificate has already been removed.
 	require.NoError(t, uninstallCert(certPEM))
 	require.False(t, isCertTrusted(certPEM))
 	require.False(t, isCertInKeychain(certPEM))
 }
 func generatePEMCertificate(t *testing.T) []byte {
 	template, err := NewTLSTemplate()
 	require.NoError(t, err)
 	certPEM, _, err := GenerateCert(template)
 	require.NoError(t, err)
-	return certPEM
+	require.Error(t, installCert([]byte{0}))   // Cannot install an invalid cert.
 	require.Error(t, uninstallCert(certPEM))   // Cannot uninstall a cert that is not installed.
 	require.NoError(t, installCert(certPEM))   // Can install a valid cert.
 	require.NoError(t, installCert(certPEM))   // Can install an already installed cert.
 	require.NoError(t, uninstallCert(certPEM)) // Can uninstall an installed cert.
 	require.Error(t, uninstallCert(certPEM))   // Cannot uninstall an already uninstalled cert.
 	require.NoError(t, installCert(certPEM))   // Can reinstall an uninstalled cert.
 	require.NoError(t, uninstallCert(certPEM)) // Can uninstall a reinstalled cert.
 }
--- a/internal/certs/cert_store_linux.go
+++ b/internal/certs/cert_store_linux.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -17,10 +17,6 @@
 package certs
 func osSupportCertInstall() bool {
 	return false
 }
 func installCert([]byte) error {
 	return nil // Linux doesn't have a root cert store.
 }
@ -28,7 +24,3 @@ func installCert([]byte) error {
 func uninstallCert([]byte) error {
 	return nil // Linux doesn't have a root cert store.
 }
 func isCertInstalled([]byte) bool {
 	return false
 }
--- a/internal/certs/cert_store_windows.go
+++ b/internal/certs/cert_store_windows.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -17,10 +17,6 @@
 package certs
 func osSupportCertInstall() bool {
 	return false
 }
 func installCert([]byte) error {
 	return nil // NOTE(GODT-986): Install certs to root cert store?
 }
@ -28,7 +24,3 @@ func installCert([]byte) error {
 func uninstallCert([]byte) error {
 	return nil // NOTE(GODT-986): Uninstall certs from root cert store?
 }
 func isCertInstalled([]byte) bool {
 	return false
 }
--- a/internal/certs/installer.go
+++ b/internal/certs/installer.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -17,66 +17,16 @@
 package certs
-import (
+type Installer struct{}
 	"errors"
 	"github.com/sirupsen/logrus"
 )
 var (
 	ErrUserCanceledCertificateInstall = errors.New("the user cancelled the authorization dialog")
 )
 type Installer struct {
 	log *logrus.Entry
 }
 func NewInstaller() *Installer {
-	return &Installer{
+	return &Installer{}
 		log: logrus.WithField("pkg", "certs"),
 	}
 }
 func (installer *Installer) OSSupportCertInstall() bool {
 	return osSupportCertInstall()
 }
 func (installer *Installer) InstallCert(certPEM []byte) error {
-	installer.log.Info("Installing the Bridge TLS certificate in the OS keychain")
+	return installCert(certPEM)
 	if err := installCert(certPEM); err != nil {
 		installer.log.WithError(err).Error("The Bridge TLS certificate could not be installed in the OS keychain")
 		return err
 	}
 	installer.log.Info("The Bridge TLS certificate was successfully installed in the OS keychain")
 	return nil
 }
 func (installer *Installer) UninstallCert(certPEM []byte) error {
-	installer.log.Info("Uninstalling the Bridge TLS certificate from the OS keychain")
+	return uninstallCert(certPEM)
 	if err := uninstallCert(certPEM); err != nil {
 		installer.log.WithError(err).Error("The Bridge TLS certificate could not be uninstalled from the OS keychain")
 		return err
 	}
 	installer.log.Info("The Bridge TLS certificate was successfully uninstalled from the OS keychain")
 	return nil
 }
 func (installer *Installer) IsCertInstalled(certPEM []byte) bool {
 	return isCertInstalled(certPEM)
 }
 // LogCertInstallStatus reports the current status of the certificate installation in the log.
 // If certificate installation is not supported on the platform, this function does nothing.
 func (installer *Installer) LogCertInstallStatus(certPEM []byte) {
 	if installer.OSSupportCertInstall() {
 		if installer.IsCertInstalled(certPEM) {
 			installer.log.Info("The Bridge TLS certificate is installed in the OS keychain")
 		} else {
 			installer.log.Info("The Bridge TLS certificate is not installed in the OS keychain")
 		}
 	}
 }
--- a/internal/certs/tls.go
+++ b/internal/certs/tls.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/certs/tls_test.go
+++ b/internal/certs/tls_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/clientconfig/applemail.go
+++ b/internal/clientconfig/applemail.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -21,7 +21,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
@ -40,10 +39,10 @@ func (c *AppleMail) Configure(
 	hostname string,
 	imapPort, smtpPort int,
 	imapSSL, smtpSSL bool,
-	username, displayName, addresses string,
+	username, addresses string,
 	password []byte,
 ) error {
-	mc := prepareMobileConfig(hostname, imapPort, smtpPort, imapSSL, smtpSSL, username, displayName, addresses, password)
+	mc := prepareMobileConfig(hostname, imapPort, smtpPort, imapSSL, smtpSSL, username, addresses, password)
 	confPath, err := saveConfigTemporarily(mc)
 	if err != nil {
@ -67,28 +66,28 @@ func prepareMobileConfig(
 	hostname string,
 	imapPort, smtpPort int,
 	imapSSL, smtpSSL bool,
-	username, displayName, addresses string,
+	username, addresses string,
 	password []byte,
 ) *mobileconfig.Config {
 	return &mobileconfig.Config{
-		DisplayName:        escapeXMLString(username),
+		DisplayName:        username,
-		EmailAddress:       escapeXMLString(addresses),
+		EmailAddress:       addresses,
-		AccountName:        escapeXMLString(displayName),
+		AccountName:        username,
-		AccountDescription: escapeXMLString(username),
+		AccountDescription: username,
-		Identifier:         escapeXMLString("protonmail " + username + strconv.FormatInt(time.Now().Unix(), 10)),
+		Identifier:         "protonmail " + username + strconv.FormatInt(time.Now().Unix(), 10),
 		IMAP: &mobileconfig.IMAP{
-			Hostname: escapeXMLString(hostname),
+			Hostname: hostname,
 			Port:     imapPort,
 			TLS:      imapSSL,
-			Username: escapeXMLString(username),
+			Username: username,
-			Password: escapeXMLString(string(password)),
+			Password: string(password),
 		},
 		SMTP: &mobileconfig.SMTP{
-			Hostname: escapeXMLString(hostname),
+			Hostname: hostname,
 			Port:     smtpPort,
 			TLS:      smtpSSL,
-			Username: escapeXMLString(username),
+			Username: username,
-			Password: escapeXMLString(string(password)),
+			Password: string(password),
 		},
 	}
 }
@ -122,13 +121,3 @@ func saveConfigTemporarily(mc *mobileconfig.Config) (fname string, err error) {
 	return
 }
 // escapeXMLString replace all occurrences of the 5 characters `&`, `<`, `>`, `"` and `'` by their respective escaped version as per the XML spec.
 // https://www.w3.org/TR/xml/#syntax
 func escapeXMLString(input string) string {
 	result := strings.ReplaceAll(input, `&`, `&amp;`)
 	result = strings.ReplaceAll(result, `<`, `&lt;`)
 	result = strings.ReplaceAll(result, `>`, `&gt;`)
 	result = strings.ReplaceAll(result, `"`, `&quot;`)
 	return strings.ReplaceAll(result, `'`, `&apos;`)
 }
--- a/internal/clientconfig/applemail_test.go
+++ b/internal/clientconfig/applemail_test.go
@ -1,38 +0,0 @@
 // Copyright (c) 2024 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
 // Proton Mail 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.
 //
 // Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 //go:build darwin
 package clientconfig
 import (
 	"testing"
 	"github.com/stretchr/testify/require"
 )
 func TestEscapeXMLString(t *testing.T) {
 	require.Equal(t, escapeXMLString(`abc&&''""<<>>def`), `abc&amp;&amp;&apos;&apos;&quot;&quot;&lt;&lt;&gt;&gt;def`)
 }
 // This test requires human interaction (user configuration profile installation prompt). It is for debugging purpose and is disabled by default.
 func _TestInstallCert(t *testing.T) { //nolint:unused
 	require.NoError(
 		t,
 		(&AppleMail{}).Configure(`127.0.0.1`, 1143, 1025, true, false, `user&>>`, `<<abc&&'"def>>`, `user&a`, []byte(`ir8R9vhdNXyB7isWzhyEkQ`)),
 	)
 }
--- a/internal/configstatus/config_status.go
+++ b/internal/configstatus/config_status.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -95,13 +95,6 @@ func (status *ConfigurationStatus) IsPending() bool {
 	return !status.Data.DataV1.PendingSince.IsZero()
 }
 func (status *ConfigurationStatus) isPendingSinceMin() int {
 	if min := int(time.Since(status.Data.DataV1.PendingSince).Minutes()); min > 0 {
 		return min
 	}
 	return 0
 }
 func (status *ConfigurationStatus) IsFromFailure() bool {
 	status.DataLock.RLock()
 	defer status.DataLock.RUnlock()
@ -135,7 +128,7 @@ func (status *ConfigurationStatus) ApplyProgress() error {
 	return status.Save()
 }
-func (status *ConfigurationStatus) RecordLinkClicked(link uint64) error {
+func (status *ConfigurationStatus) RecordLinkClicked(link uint) error {
 	status.DataLock.Lock()
 	defer status.DataLock.Unlock()
@ -198,11 +191,11 @@ func (data *ConfigurationStatusData) init() {
 	data.DataV1.FailureDetails = ""
 }
-func (data *ConfigurationStatusData) setClickedLink(pos uint64) {
+func (data *ConfigurationStatusData) setClickedLink(pos uint) {
 	data.DataV1.ClickedLink |= 1 << pos
 }
-func (data *ConfigurationStatusData) hasLinkClicked(pos uint64) bool {
+func (data *ConfigurationStatusData) hasLinkClicked(pos uint) bool {
 	val := data.DataV1.ClickedLink & (1 << pos)
 	return val > 0
 }
@ -211,7 +204,7 @@ func (data *ConfigurationStatusData) clickedLinkToString() string {
 	var str = ""
 	var first = true
 	for i := 0; i < 64; i++ {
-		if data.hasLinkClicked(uint64(i)) {
+		if data.hasLinkClicked(uint(i)) {
 			if !first {
 				str += ","
 			} else {
--- a/internal/configstatus/config_status_test.go
+++ b/internal/configstatus/config_status_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/configstatus/configuration_abort.go
+++ b/internal/configstatus/configuration_abort.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -19,6 +19,7 @@ package configstatus
 import (
 	"strconv"
 	"time"
 )
 type ConfigAbortValues struct {
@ -40,20 +41,17 @@ type ConfigAbortData struct {
 type ConfigAbortBuilder struct{}
-func (*ConfigAbortBuilder) New(config *ConfigurationStatus) ConfigAbortData {
+func (*ConfigAbortBuilder) New(data *ConfigurationStatusData) ConfigAbortData {
 	config.DataLock.RLock()
 	defer config.DataLock.RUnlock()
 	return ConfigAbortData{
 		MeasurementGroup: "bridge.any.configuration",
 		Event:            "bridge_config_abort",
 		Values: ConfigSuccessValues{
-			Duration: config.isPendingSinceMin(),
+			Duration: int(time.Since(data.DataV1.PendingSince).Minutes()),
 		},
 		Dimensions: ConfigSuccessDimensions{
-			ReportClick: strconv.FormatBool(config.Data.DataV1.ReportClick),
+			ReportClick: strconv.FormatBool(data.DataV1.ReportClick),
-			ReportSent:  strconv.FormatBool(config.Data.DataV1.ReportSent),
+			ReportSent:  strconv.FormatBool(data.DataV1.ReportSent),
-			ClickedLink: config.Data.clickedLinkToString(),
+			ClickedLink: data.clickedLinkToString(),
 		},
 	}
 }
--- a/internal/configstatus/configuration_abort_test.go
+++ b/internal/configstatus/configuration_abort_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -33,7 +33,7 @@ func TestConfigurationAbort_default(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigAbortBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_abort", req.Event)
@ -64,7 +64,7 @@ func TestConfigurationAbort_fed(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigAbortBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_abort", req.Event)
--- a/internal/configstatus/configuration_progress.go
+++ b/internal/configstatus/configuration_progress.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -33,16 +33,13 @@ type ConfigProgressData struct {
 type ConfigProgressBuilder struct{}
-func (*ConfigProgressBuilder) New(config *ConfigurationStatus) ConfigProgressData {
+func (*ConfigProgressBuilder) New(data *ConfigurationStatusData) ConfigProgressData {
 	config.DataLock.RLock()
 	defer config.DataLock.RUnlock()
 	return ConfigProgressData{
 		MeasurementGroup: "bridge.any.configuration",
 		Event:            "bridge_config_progress",
 		Values: ConfigProgressValues{
-			NbDay:          numberOfDay(time.Now(), config.Data.DataV1.PendingSince),
+			NbDay:          numberOfDay(time.Now(), data.DataV1.PendingSince),
-			NbDaySinceLast: numberOfDay(time.Now(), config.Data.DataV1.LastProgress),
+			NbDaySinceLast: numberOfDay(time.Now(), data.DataV1.LastProgress),
 		},
 	}
 }
@ -52,7 +49,10 @@ func numberOfDay(now, prev time.Time) int {
 		return 1
 	}
 	if now.Year() > prev.Year() {
-		return (365 * (now.Year() - prev.Year())) + now.YearDay() - prev.YearDay()
+		if now.YearDay() > prev.YearDay() {
 			return 365 + (now.YearDay() - prev.YearDay())
 		}
 		return (prev.YearDay() + now.YearDay()) - 365
 	} else if now.YearDay() > prev.YearDay() {
 		return now.YearDay() - prev.YearDay()
 	}
--- a/internal/configstatus/configuration_progress_test.go
+++ b/internal/configstatus/configuration_progress_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -33,7 +33,7 @@ func TestConfigurationProgress_default(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigProgressBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_progress", req.Event)
@ -62,39 +62,10 @@ func TestConfigurationProgress_fed(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigProgressBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_progress", req.Event)
 	require.Equal(t, 5, req.Values.NbDay)
 	require.Equal(t, 2, req.Values.NbDaySinceLast)
 }
 func TestConfigurationProgress_fed_year_change(t *testing.T) {
 	dir := t.TempDir()
 	file := filepath.Join(dir, "dummy.json")
 	var data = configstatus.ConfigurationStatusData{
 		Metadata: configstatus.Metadata{Version: "1.0.0"},
 		DataV1: configstatus.DataV1{
 			PendingSince:   time.Now().AddDate(-1, 0, -5),
 			LastProgress:   time.Now().AddDate(0, 0, -2),
 			Autoconf:       "Mr TBird",
 			ClickedLink:    42,
 			ReportSent:     false,
 			ReportClick:    true,
 			FailureDetails: "Not an error",
 		},
 	}
 	require.NoError(t, dumpConfigStatusInFile(&data, file))
 	config, err := configstatus.LoadConfigurationStatus(file)
 	require.NoError(t, err)
 	var builder = configstatus.ConfigProgressBuilder{}
 	req := builder.New(config)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_progress", req.Event)
 	require.True(t, (req.Values.NbDay == 370) || (req.Values.NbDay == 371)) // leap year is accounted for in the simplest manner.
 	require.Equal(t, 2, req.Values.NbDaySinceLast)
 }
--- a/internal/configstatus/configuration_recovery.go
+++ b/internal/configstatus/configuration_recovery.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -19,6 +19,7 @@ package configstatus
 import (
 	"strconv"
 	"time"
 )
 type ConfigRecoveryValues struct {
@ -42,22 +43,19 @@ type ConfigRecoveryData struct {
 type ConfigRecoveryBuilder struct{}
-func (*ConfigRecoveryBuilder) New(config *ConfigurationStatus) ConfigRecoveryData {
+func (*ConfigRecoveryBuilder) New(data *ConfigurationStatusData) ConfigRecoveryData {
 	config.DataLock.RLock()
 	defer config.DataLock.RUnlock()
 	return ConfigRecoveryData{
 		MeasurementGroup: "bridge.any.configuration",
 		Event:            "bridge_config_recovery",
 		Values: ConfigRecoveryValues{
-			Duration: config.isPendingSinceMin(),
+			Duration: int(time.Since(data.DataV1.PendingSince).Minutes()),
 		},
 		Dimensions: ConfigRecoveryDimensions{
-			Autoconf:       config.Data.DataV1.Autoconf,
+			Autoconf:       data.DataV1.Autoconf,
-			ReportClick:    strconv.FormatBool(config.Data.DataV1.ReportClick),
+			ReportClick:    strconv.FormatBool(data.DataV1.ReportClick),
-			ReportSent:     strconv.FormatBool(config.Data.DataV1.ReportSent),
+			ReportSent:     strconv.FormatBool(data.DataV1.ReportSent),
-			ClickedLink:    config.Data.clickedLinkToString(),
+			ClickedLink:    data.clickedLinkToString(),
-			FailureDetails: config.Data.DataV1.FailureDetails,
+			FailureDetails: data.DataV1.FailureDetails,
 		},
 	}
 }
--- a/internal/configstatus/configuration_recovery_test.go
+++ b/internal/configstatus/configuration_recovery_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -33,7 +33,7 @@ func TestConfigurationRecovery_default(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigRecoveryBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_recovery", req.Event)
@ -66,7 +66,7 @@ func TestConfigurationRecovery_fed(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigRecoveryBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_recovery", req.Event)
--- a/internal/configstatus/configuration_success.go
+++ b/internal/configstatus/configuration_success.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -19,6 +19,7 @@ package configstatus
 import (
 	"strconv"
 	"time"
 )
 type ConfigSuccessValues struct {
@ -41,21 +42,18 @@ type ConfigSuccessData struct {
 type ConfigSuccessBuilder struct{}
-func (*ConfigSuccessBuilder) New(config *ConfigurationStatus) ConfigSuccessData {
+func (*ConfigSuccessBuilder) New(data *ConfigurationStatusData) ConfigSuccessData {
 	config.DataLock.RLock()
 	defer config.DataLock.RUnlock()
 	return ConfigSuccessData{
 		MeasurementGroup: "bridge.any.configuration",
 		Event:            "bridge_config_success",
 		Values: ConfigSuccessValues{
-			Duration: config.isPendingSinceMin(),
+			Duration: int(time.Since(data.DataV1.PendingSince).Minutes()),
 		},
 		Dimensions: ConfigSuccessDimensions{
-			Autoconf:    config.Data.DataV1.Autoconf,
+			Autoconf:    data.DataV1.Autoconf,
-			ReportClick: strconv.FormatBool(config.Data.DataV1.ReportClick),
+			ReportClick: strconv.FormatBool(data.DataV1.ReportClick),
-			ReportSent:  strconv.FormatBool(config.Data.DataV1.ReportSent),
+			ReportSent:  strconv.FormatBool(data.DataV1.ReportSent),
-			ClickedLink: config.Data.clickedLinkToString(),
+			ClickedLink: data.clickedLinkToString(),
 		},
 	}
 }
--- a/internal/configstatus/configuration_success_test.go
+++ b/internal/configstatus/configuration_success_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
@ -33,7 +33,7 @@ func TestConfigurationSuccess_default(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigSuccessBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_success", req.Event)
@ -65,7 +65,7 @@ func TestConfigurationSuccess_fed(t *testing.T) {
 	require.NoError(t, err)
 	var builder = configstatus.ConfigSuccessBuilder{}
-	req := builder.New(config)
+	req := builder.New(config.Data)
 	require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
 	require.Equal(t, "bridge_config_success", req.Event)
--- a/internal/configstatus/types_config_status.go
+++ b/internal/configstatus/types_config_status.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/constants/constants.go
+++ b/internal/constants/constants.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.Bridge.
 //
--- a/internal/constants/host_default.go
+++ b/internal/constants/host_default.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/constants/host_qa.go
+++ b/internal/constants/host_qa.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/constants/update_default.go
+++ b/internal/constants/update_default.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/constants/update_qa.go
+++ b/internal/constants/update_qa.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/constants/version_default.go
+++ b/internal/constants/version_default.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.Bridge.
 //
--- a/internal/constants/version_qa.go
+++ b/internal/constants/version_qa.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/constants/version_test.go
+++ b/internal/constants/version_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.Bridge.
 //
--- a/internal/cookies/jar.go
+++ b/internal/cookies/jar.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/cookies/jar_test.go
+++ b/internal/cookies/jar_test.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/internal/crash/actions.go
+++ b/internal/crash/actions.go
@ -1,4 +1,4 @@
-// Copyright (c) 2024 Proton AG
+// Copyright (c) 2023 Proton AG
 //
 // This file is part of Proton Mail Bridge.
 //
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jakub	a80fd92018	chore: Trift Bridge 3.4.2 changelog.	2023-09-01 15:12:34 +02:00
Jakub	71063ac5ee	fix(GODT-2902): do not check for changed values. Related to GODT-2857.	2023-09-01 14:44:27 +02:00
		`@ -1,2 +0,0 @@`
			`# Check out for configuration details: https://github.com/anchore/grype?tab=readme-ov-file#configuration`
			`fail-on-severity: "medium"`