diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 55b355d82..3a5bcfee5 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -2696,6 +2696,14 @@ bool Boiler::set_reset(const char * value, const int8_t id) {
         // LOG_INFO("Reset boiler error message");
         write_command(0x05, 0x00, 0x5A); // error reset
         return true;
+    } else if (num == 3) {
+        // LOG_INFO("Reset boiler history");
+        write_command(0x05, 42, 0x01); // clear history
+        return true;
+    } else if (num == 4) {
+        // LOG_INFO("Reset boiler message");
+        write_command(0x05, 0x08, 0xFF); // same as maintenance
+        return true;
     }
     return false;
 }
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index a6b77ff9d..00ae05922 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -1863,11 +1863,11 @@ bool Thermostat::set_remotetemp(const char * value, const int8_t id) {
     } else if (model() == EMSdevice::EMS_DEVICE_FLAG_RC35 || model() == EMSdevice::EMS_DEVICE_FLAG_RC30_N) {
         Roomctrl::set_remotetemp(Roomctrl::RC20, hc->hc(), hc->remotetemp); // RC20
     } else if ((model() == EMSdevice::EMS_DEVICE_FLAG_BC400) || model() == EMSdevice::EMS_DEVICE_FLAG_RC300) {
-        if (hc->control == 1) {
+        if (hc->control == 1 || hc->control == 0) {
             Roomctrl::set_remotetemp(Roomctrl::RC200, hc->hc(), hc->remotetemp);  // RC200
         } else if (hc->control == 3) {                                            // RC100H(3)
             Roomctrl::set_remotetemp(Roomctrl::RC100H, hc->hc(), hc->remotetemp); // RC100H
-        } else if (hc->control == 2 || hc->control == 0) {                        // RC100(2) and RC310(0)
+        } else if (hc->control == 2) {                                            // RC100(2)
             Roomctrl::set_remotetemp(Roomctrl::RC100, hc->hc(), hc->remotetemp);  // RC100
         } else {
             hc->remotetemp = EMS_VALUE_SHORT_NOTSET;
diff --git a/src/locale_common.h b/src/locale_common.h
index 2eb144842..3aa42a52f 100644
--- a/src/locale_common.h
+++ b/src/locale_common.h
@@ -285,7 +285,7 @@ MAKE_ENUM(enum_comfort, FL_(hot), FL_(eco), FL_(intelligent))
 MAKE_ENUM(enum_comfort1, FL_(high_comfort), FL_(eco))
 MAKE_ENUM(enum_comfort2, FL_(eco), FL_(high_comfort))
 MAKE_ENUM(enum_flow, FL_(off), FL_(flow), FL_(bufferedflow), FL_(buffer), FL_(layeredbuffer))
-MAKE_ENUM(enum_reset, FL_(dash), FL_(maintenance), FL_(error))
+MAKE_ENUM(enum_reset, FL_(dash), FL_(maintenance), FL_(error), FL_(history), FL_(message))
 MAKE_ENUM(enum_maxHeat, FL_(0kW), FL_(2kW), FL_(3kW), FL_(4kW), FL_(6kW), FL_(9kW))
 MAKE_ENUM(enum_pumpMode, FL_(proportional), FL_(deltaP1), FL_(deltaP2), FL_(deltaP3), FL_(deltaP4))
 MAKE_ENUM(enum_hpPumpMode, FL_(auto), FL_(continuous))
diff --git a/src/locale_translations.h b/src/locale_translations.h
index b65ac8ad2..a106791b1 100644
--- a/src/locale_translations.h
+++ b/src/locale_translations.h
@@ -164,6 +164,8 @@ MAKE_WORD_TRANSLATION(extern, "extern", "extern", "extern", "extern", "zewnętrz
 MAKE_WORD_TRANSLATION(intern, "intern", "intern", "intern", "intern", "wewnętrzny", "intern", "interne", "iç", "interno", "interný")
 MAKE_WORD_TRANSLATION(lower, "lower", "niedirger", "lager", "lägre", "mniejszy", "nedre", "inférieur", "daha düşük", "basso", "nízky")
 MAKE_WORD_TRANSLATION(error, "error", "Fehler", "error", "Fel", "błąd", "feil", "erreur", "Hata", "errore", "error")
+MAKE_WORD_TRANSLATION(history, "history", "Fehlerspeicher", "", "", "", "", "", "", "", "") // ToDo translate
+MAKE_WORD_TRANSLATION(message, "message", "Meldung", "melding", "meddelande", "", "melding", "message", "mesajı", "messaggio", "") // ToDo translate
 MAKE_WORD_TRANSLATION(na, "n/a", "n/a", "n/a", "n/a", "nd.", "n/a", "n/c", "mevcut değil", "n/a", "n/a")
 MAKE_WORD_TRANSLATION(inverted, "inverted", "invertiert", "", "", "", "", "", "", "", "")