Index: sources/view/settings/VDateTime.cpp
===================================================================
diff -u -raa873f8620e3f402bf60827e9c54623b5e09280e -r80922f18391e9bb04eea491a2412f5c7923d32a3
--- sources/view/settings/VDateTime.cpp	(.../VDateTime.cpp)	(revision aa873f8620e3f402bf60827e9c54623b5e09280e)
+++ sources/view/settings/VDateTime.cpp	(.../VDateTime.cpp)	(revision 80922f18391e9bb04eea491a2412f5c7923d32a3)
@@ -218,18 +218,16 @@
            );
 }
 
+/*!
+ * \brief   VDateTime::greeting
+ * \details sets the greeting property string to be used on the standby/home screen regarding the device's current time of the day.
+ * \param   vMilitaryTime
+ */
 void VDateTime::greeting(quint16 vMilitaryTime)
 {
-    if ( 0500 <= vMilitaryTime && vMilitaryTime < 1200 ) {
-        greeting(tr("Good Morning"));
-        return;
-    }
+    if (   eMorningMin  <= vMilitaryTime && vMilitaryTime <   eMorningMax   ) { greeting(tr("Good Morning"  )); return; }
+    if ( eAfternoonMin  <= vMilitaryTime && vMilitaryTime < eAfternoonMax   ) { greeting(tr("Good Afternoon")); return; }
 
-    if ( 1200 <= vMilitaryTime && vMilitaryTime < 1800 ) {
-        greeting(tr("Good Afternoon"));
-        return;
-    }
-
     greeting(tr("Good Evening"));
 }