Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -r71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b -rb45c898bb2fef51abb9460a1306f07eaa8dcbab0
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision b45c898bb2fef51abb9460a1306f07eaa8dcbab0)
@@ -154,13 +154,7 @@
       || ( _alarm_Flag_alarmsSilencedChanged    && ! _alarm_Flag_alarmsSilenced )
       ){
 
-        _alarmInstructionsList.clear();
-        for (QMap<QString, QString>::const_iterator it = _alarms[_alarm_AlarmID].instructions.constBegin();
-                                                    it != _alarms[_alarm_AlarmID].instructions.constEnd(); ++it) {
-
-            _alarmInstructionsList.appendData( {{VAlarmInstructionsModel::eRole_Instruction,    it.key() },
-                                                {VAlarmInstructionsModel::eRole_Image,          "file:" + it.value()}});
-        }
+        _alarmInstructionsList = _alarms[_alarm_AlarmID].instructions;
         emit didAlarmRaise();
     }
 }
@@ -186,7 +180,6 @@
 }
 
 QString     VAlarmStatus::title             () { if ( ! _alarm_AlarmID ) return {}; QString s = _alarms[_alarm_AlarmID].title  ; if ( ! s.isEmpty()) return s; else return tr("Alarm") ; }
-QString     VAlarmStatus::message           () { if ( ! _alarm_AlarmID ) return {}; QString s = _alarms[_alarm_AlarmID].message; if ( ! s.isEmpty()) return s; else return text()      ; }
 
 /*!
  * \brief   View::VAlarmStatus::onActionReceive
@@ -207,16 +200,20 @@
         for (const QString &key : _Settings.keys(category, group)) {
             if         (Storage::Settings::isKeyTitle       ( key ) ) {
                 alarmData.title      = _Settings.value(category, group, key).toString();
-            } else if  (Storage::Settings::isKeyMessage     ( key ) ) {
-                alarmData.message    = _Settings.value(category, group, key).toString();
             } else {
                 const QString imagePath = QStringLiteral("%1%2").arg(_location)
                                                                 .arg(_Settings.value(category, group, key).toString());
-                instructionData[key] = QFile::exists(imagePath) ? imagePath : QStringLiteral("%1%2").arg(_location)
-                                                                                                    .arg("defaultImage.png");
+                QHash<int, QVariant> instructionStep;
+                instructionStep.insert(VAlarmInstructionsModel::eRole_Instruction, key);
+                instructionStep.insert(VAlarmInstructionsModel::eRole_Image, QFile::exists(imagePath) ? "file:" + imagePath :
+                                                                                 QStringLiteral("file:%1%2").arg(_location)
+                                                                                     .arg("defaultImage.png"));
+
+                instructionData.append(instructionStep);
                 alarmData.instructions  = instructionData;
             }
         }
+
         _alarms[id] = alarmData;
 
         /// DEBUG: