diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eada2143..5725e3bcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 #### Version 0.21.1
 * Initial support for EXRIZU K8 (HPLus variant)
+* Amazfit Bip: fix long messages not being displayed at all
 * Mi Band 2: Support multiple button actions
 * NO.1 F1: Fetch sleep data
 * NO.1 F1: Heart rate support
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java
index 57fb1941e..928d5c6b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java
@@ -80,7 +80,7 @@ public class AmazfitBipSupport extends MiBand2Support {
         try {
             TransactionBuilder builder = performInitialized("new notification");
             AlertNotificationProfile<?> profile = new AlertNotificationProfile(this);
-            profile.setMaxLength(255); // TODO: find out real limit, certainly it is more than 18 which is default
+            profile.setMaxLength(230);
 
             int customIconId = AmazfitBipIcon.mapToIconId(notificationSpec.type);
 
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 279278358..4cf3ec831 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -2,6 +2,7 @@
 <changelog>
     <release version="0.21.1" versioncode="102">
         <change>Initial support for EXRIZU K8 (HPLus variant)</change>
+        <change>Amazfit Bip: fix long messages not being displayed at all</change>
         <change>Mi Band 2: Support multiple button actions</change>
         <change>NO.1 F1: Fetch sleep data</change>
         <change>NO.1 F1: Heart rate support</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/102.txt b/fastlane/metadata/android/en-US/changelogs/102.txt
index 48f0aca9a..942f08d96 100644
--- a/fastlane/metadata/android/en-US/changelogs/102.txt
+++ b/fastlane/metadata/android/en-US/changelogs/102.txt
@@ -1,4 +1,5 @@
 * Initial support for EXRIZU K8 (HPLus variant)
+* Amazfit Bip: fix long messages not being displayed at all
 * Mi Band 2: Support multiple button actions
 * NO.1 F1: Fetch sleep data
 * NO.1 F1: Heart rate support