diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index b76f0e4b4..8289a56f1 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -302,8 +302,8 @@
 #define D_SINGLE_DEVICE "одиночное"
 #define D_MULTI_DEVICE "мульти"
 
-#define D_CONFIGURE_TEMPLATE "Configure Template"
-#define D_TEMPLATE_PARAMETERS "Template parameters"
+#define D_CONFIGURE_TEMPLATE "Конфигурация Template"
+#define D_TEMPLATE_PARAMETERS "Параметры Template"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
 #define D_TEMPLATE_FLAGS "Options"
@@ -386,7 +386,7 @@
 #define D_3_RESPONSE_PACKETS_SENT "3 ответных пакета получено"
 
 // xdrv_07_domoticz.ino
-#define D_DOMOTICZ_PARAMETERS "Domoticz parameters"
+#define D_DOMOTICZ_PARAMETERS "Параметры Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
 #define D_DOMOTICZ_SWITCH_IDX "Switch idx"
@@ -403,8 +403,8 @@
 #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
 
 // xdrv_09_timers.ino
-#define D_CONFIGURE_TIMER "Configure Timer"
-#define D_TIMER_PARAMETERS "Timer parameters"
+#define D_CONFIGURE_TIMER "Конфигурация Timer"
+#define D_TIMER_PARAMETERS "Параметры Timer"
 #define D_TIMER_ENABLE "Enable Timers"
 #define D_TIMER_ARM "Arm"
 #define D_TIMER_TIME "Time"
@@ -414,8 +414,8 @@
 #define D_TIMER_ACTION "Action"
 
 // xdrv_10_knx.ino
-#define D_CONFIGURE_KNX "Configure KNX"
-#define D_KNX_PARAMETERS "KNX Parameters"
+#define D_CONFIGURE_KNX "Конфигурация KNX"
+#define D_KNX_PARAMETERS "Параметры KNX"
 #define D_KNX_GENERAL_CONFIG "General"
 #define D_KNX_PHYSICAL_ADDRESS "Physical Address"
 #define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )"
diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index c968af406..5a26a86c6 100755
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -170,7 +170,7 @@ bool backlog_mutex = false;                 // Command backlog pending
 bool interlock_mutex = false;               // Interlock power command pending
 bool stop_flash_rotate = false;             // Allow flash configuration rotation
 bool blinkstate = false;                    // LED state
-bool latest_uptime_flag = true;             // Signal latest uptime
+//bool latest_uptime_flag = true;             // Signal latest uptime
 bool pwm_present = false;                   // Any PWM channel configured with SetOption15 0
 bool dht_flg = false;                       // DHT configured
 bool i2c_flg = false;                       // I2C configured
@@ -1801,7 +1801,7 @@ void PublishStatus(uint8_t payload)
 {
   uint8_t option = STAT;
   char stemp[MAX_FRIENDLYNAMES * (sizeof(Settings.friendlyname[0]) +MAX_FRIENDLYNAMES)];
-  char stemp2[64];
+  char stemp2[100];
 
   // Workaround MQTT - TCP/IP stack queueing when SUB_PREFIX = PUB_PREFIX
   if (!strcmp(Settings.mqtt_prefix[0],Settings.mqtt_prefix[1]) && (!payload)) { option++; }  // TELE
diff --git a/sonoff/xdrv_01_webserver.ino b/sonoff/xdrv_01_webserver.ino
index 3653045ef..2ce8595cc 100644
--- a/sonoff/xdrv_01_webserver.ino
+++ b/sonoff/xdrv_01_webserver.ino
@@ -800,10 +800,10 @@ void WSContentSendStyle(void)
 void WSContentButton(uint8_t title_index)
 {
   char action[4];
-  char title[64];
+  char title[100];  // Large to accomodate UTF-16 as used by Russian
 
   if (title_index <= BUTTON_RESET_CONFIGURATION) {
-    char confirm[64];
+    char confirm[100];
     WSContentSend_P(PSTR("<p><form action='%s' method='get' onsubmit='return confirm(\"%s\");'><button name='%s' class='button bred'>%s</button></form></p>"),
       GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
       GetTextIndexed(confirm, sizeof(confirm), title_index, kButtonConfirm),