Merge branch 'develop' into 'issue/2115'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index e0982b83cd98d6a73a3c9f3c2b994c56ab7fbacc,b17a0e999d8a5c2cbfd326e7c062ed2fdb07e5e3..5f5d01af34e94be5b8781931aa0d42951db004b6
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -29,7 -28,7 +28,9 @@@ The format is based on [Keep a Changelo
  switched to a new configuration mechanism, however it was not officially removed until now.
  
  ### Fixed
++
 +- Add documented-but-missing chat pagination.
+ - Allow sending out emails again.
  
  ## [2.1.2] - 2020-09-17