diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23a97e68dd..95583c45a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,40 +2,6 @@
🌎 [Google Translate](https://translate.google.com/translate?sl=en&u=https%3A%2F%2Fgithub.com%2FM66B%2FFairEmail%2Fblob%2Fmaster%2FCHANGELOG.md)
-### Notices
-
-You may have noticed that fewer new features have been added recently and therefore fewer new (test) versions have been released.
-This is a result of saying “no” more often to new features that do not enhance the overall usability of the app (see below).
-What is not very motivating is that a number of people who consider themselves more important than other people have left bad reviews for this.
-I am not giving up, but this is just not nice, also considering that it is not a commercial project.
-On a positive note, a number of people contacted me to encourage me, for which many thanks!
-
-
-
-Google requires FairEmail to undergo an annual [CASA](https://appdefensealliance.dev/casa) security audit,
-which must be conducted by an authorized assessor (this year [TAC Security](https://casa.tacsecurity.com/site/home)).
-Besides being time-consuming, this is no longer free as of this year.
-This is one of the reasons why the app cannot be completely free, meaning some features must be paid for in order to pay for an annual security audit.
-To be clear, nothing will be changed for now.
-
-The security audit revealed no problems, so Google accounts [can continue to be used](https://support.google.com/cloud/answer/13464325) as usual next year.
-
-
-
-People keep asking me to add new, often exotic, features to the app, to whom I often say "no", and other people complain about too many features.
-Both groups of people leave bad reviews for this, which is frustrating, also because there are already enough bad reviews for the wrong reasons
-(email server problems, which unfortunately happen too often, etc.).
-The main problem is that more features now make more people unhappy than happy.
-Therefore, [the rules for new features](https://m66b.github.io/FairEmail/#get-support) will be strictly followed from today.
-
-No worries, the app will [continue to be maintained](https://github.com/M66B/FairEmail/commits/) and supported as usual.
-
-
-
-For support you can use [the contact form](https://contact.faircode.eu/?product=fairemailsupport).
-
-
-
### [Ceratonykus](https://en.wikipedia.org/wiki/Ceratonykus)
### Next version
@@ -3653,3 +3619,35 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=
### 1.1719
* Added tap on folder name to go to folder (conversation/message view only)
+
+### Notices
+
+You may have noticed that fewer new features have been added recently and therefore fewer new (test) versions have been released.
+This is a result of saying “no” more often to new features that do not enhance the overall usability of the app (see below).
+What is not very motivating is that a number of people who consider themselves more important than other people have left bad reviews for this.
+I am not giving up, but this is just not nice, also considering that it is not a commercial project.
+On a positive note, a number of people contacted me to encourage me, for which many thanks!
+
+
+
+Google requires FairEmail to undergo an annual [CASA](https://appdefensealliance.dev/casa) security audit,
+which must be conducted by an authorized assessor (this year [TAC Security](https://casa.tacsecurity.com/site/home)).
+Besides being time-consuming, this is no longer free as of this year.
+This is one of the reasons why the app cannot be completely free, meaning some features must be paid for in order to pay for an annual security audit.
+To be clear, nothing will be changed for now.
+
+The security audit revealed no problems, so Google accounts [can continue to be used](https://support.google.com/cloud/answer/13464325) as usual next year.
+
+
+
+People keep asking me to add new, often exotic, features to the app, to whom I often say "no", and other people complain about too many features.
+Both groups of people leave bad reviews for this, which is frustrating, also because there are already enough bad reviews for the wrong reasons
+(email server problems, which unfortunately happen too often, etc.).
+The main problem is that more features now make more people unhappy than happy.
+Therefore, [the rules for new features](https://m66b.github.io/FairEmail/#get-support) will be strictly followed from today.
+
+No worries, the app will [continue to be maintained](https://github.com/M66B/FairEmail/commits/) and supported as usual.
+
+
+
+For support you can use [the contact form](https://contact.faircode.eu/?product=fairemailsupport).
diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md
index 23a97e68dd..95583c45a3 100644
--- a/app/src/main/assets/CHANGELOG.md
+++ b/app/src/main/assets/CHANGELOG.md
@@ -2,40 +2,6 @@
🌎 [Google Translate](https://translate.google.com/translate?sl=en&u=https%3A%2F%2Fgithub.com%2FM66B%2FFairEmail%2Fblob%2Fmaster%2FCHANGELOG.md)
-### Notices
-
-You may have noticed that fewer new features have been added recently and therefore fewer new (test) versions have been released.
-This is a result of saying “no” more often to new features that do not enhance the overall usability of the app (see below).
-What is not very motivating is that a number of people who consider themselves more important than other people have left bad reviews for this.
-I am not giving up, but this is just not nice, also considering that it is not a commercial project.
-On a positive note, a number of people contacted me to encourage me, for which many thanks!
-
-
-
-Google requires FairEmail to undergo an annual [CASA](https://appdefensealliance.dev/casa) security audit,
-which must be conducted by an authorized assessor (this year [TAC Security](https://casa.tacsecurity.com/site/home)).
-Besides being time-consuming, this is no longer free as of this year.
-This is one of the reasons why the app cannot be completely free, meaning some features must be paid for in order to pay for an annual security audit.
-To be clear, nothing will be changed for now.
-
-The security audit revealed no problems, so Google accounts [can continue to be used](https://support.google.com/cloud/answer/13464325) as usual next year.
-
-
-
-People keep asking me to add new, often exotic, features to the app, to whom I often say "no", and other people complain about too many features.
-Both groups of people leave bad reviews for this, which is frustrating, also because there are already enough bad reviews for the wrong reasons
-(email server problems, which unfortunately happen too often, etc.).
-The main problem is that more features now make more people unhappy than happy.
-Therefore, [the rules for new features](https://m66b.github.io/FairEmail/#get-support) will be strictly followed from today.
-
-No worries, the app will [continue to be maintained](https://github.com/M66B/FairEmail/commits/) and supported as usual.
-
-
-
-For support you can use [the contact form](https://contact.faircode.eu/?product=fairemailsupport).
-
-
-
### [Ceratonykus](https://en.wikipedia.org/wiki/Ceratonykus)
### Next version
@@ -3653,3 +3619,35 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=
### 1.1719
* Added tap on folder name to go to folder (conversation/message view only)
+
+### Notices
+
+You may have noticed that fewer new features have been added recently and therefore fewer new (test) versions have been released.
+This is a result of saying “no” more often to new features that do not enhance the overall usability of the app (see below).
+What is not very motivating is that a number of people who consider themselves more important than other people have left bad reviews for this.
+I am not giving up, but this is just not nice, also considering that it is not a commercial project.
+On a positive note, a number of people contacted me to encourage me, for which many thanks!
+
+
+
+Google requires FairEmail to undergo an annual [CASA](https://appdefensealliance.dev/casa) security audit,
+which must be conducted by an authorized assessor (this year [TAC Security](https://casa.tacsecurity.com/site/home)).
+Besides being time-consuming, this is no longer free as of this year.
+This is one of the reasons why the app cannot be completely free, meaning some features must be paid for in order to pay for an annual security audit.
+To be clear, nothing will be changed for now.
+
+The security audit revealed no problems, so Google accounts [can continue to be used](https://support.google.com/cloud/answer/13464325) as usual next year.
+
+
+
+People keep asking me to add new, often exotic, features to the app, to whom I often say "no", and other people complain about too many features.
+Both groups of people leave bad reviews for this, which is frustrating, also because there are already enough bad reviews for the wrong reasons
+(email server problems, which unfortunately happen too often, etc.).
+The main problem is that more features now make more people unhappy than happy.
+Therefore, [the rules for new features](https://m66b.github.io/FairEmail/#get-support) will be strictly followed from today.
+
+No worries, the app will [continue to be maintained](https://github.com/M66B/FairEmail/commits/) and supported as usual.
+
+
+
+For support you can use [the contact form](https://contact.faircode.eu/?product=fairemailsupport).
diff --git a/metadata/en-US/changelogs/2268.txt b/metadata/en-US/changelogs/2268.txt
index c5e9687a9d..6d8914cec6 100644
--- a/metadata/en-US/changelogs/2268.txt
+++ b/metadata/en-US/changelogs/2268.txt
@@ -2,40 +2,6 @@ Changelog
--------------------
-Notices
-
-You may have noticed that fewer new features have been added recently and therefore fewer new (test) versions have been released.
-This is a result of saying “no” more often to new features that do not enhance the overall usability of the app (see below).
-What is not very motivating is that a number of people who consider themselves more important than other people have left bad reviews for this.
-I am not giving up, but this is just not nice, also considering that it is not a commercial project.
-On a positive note, a number of people contacted me to encourage me, for which many thanks!
-
----
-
-Google requires FairEmail to undergo an annual CASA security audit,
-which must be conducted by an authorized assessor (this year TAC Security.
-Besides being time-consuming, this is no longer free as of this year.
-This is one of the reasons why the app cannot be completely free, meaning some features must be paid for in order to pay for an annual security audit.
-To be clear, nothing will be changed for now.
-
-The security audit revealed no problems, so Google accounts can continue to be used as usual next year.
-
----
-
-People keep asking me to add new, often exotic, features to the app, to whom I often say "no", and other people complain about too many features.
-Both groups of people leave bad reviews for this, which is frustrating, also because there are already enough bad reviews for the wrong reasons
-(email server problems, which unfortunately happen too often, etc.).
-The main problem is that more features now make more people unhappy than happy.
-Therefore, the rules for new features will be strictly followed from today.
-
-No worries, the app will continue to be maintained and supported as usual.
-
----
-
-For support you can use the contact form.
-
----
-
Ceratonykus
Next version
@@ -3653,3 +3619,35 @@ Xiyunykus
1.1719
* Added tap on folder name to go to folder (conversation/message view only)
+
+Notices
+
+You may have noticed that fewer new features have been added recently and therefore fewer new (test) versions have been released.
+This is a result of saying “no” more often to new features that do not enhance the overall usability of the app (see below).
+What is not very motivating is that a number of people who consider themselves more important than other people have left bad reviews for this.
+I am not giving up, but this is just not nice, also considering that it is not a commercial project.
+On a positive note, a number of people contacted me to encourage me, for which many thanks!
+
+---
+
+Google requires FairEmail to undergo an annual CASA security audit,
+which must be conducted by an authorized assessor (this year TAC Security.
+Besides being time-consuming, this is no longer free as of this year.
+This is one of the reasons why the app cannot be completely free, meaning some features must be paid for in order to pay for an annual security audit.
+To be clear, nothing will be changed for now.
+
+The security audit revealed no problems, so Google accounts can continue to be used as usual next year.
+
+---
+
+People keep asking me to add new, often exotic, features to the app, to whom I often say "no", and other people complain about too many features.
+Both groups of people leave bad reviews for this, which is frustrating, also because there are already enough bad reviews for the wrong reasons
+(email server problems, which unfortunately happen too often, etc.).
+The main problem is that more features now make more people unhappy than happy.
+Therefore, the rules for new features will be strictly followed from today.
+
+No worries, the app will continue to be maintained and supported as usual.
+
+---
+
+For support you can use the contact form.