diff --git a/host-by-telegram.sh b/host-by-telegram.sh
index e3f8cbc..bf5da75 100755
--- a/host-by-telegram.sh
+++ b/host-by-telegram.sh
@@ -21,6 +21,7 @@
 PROG="`basename $0`"
 HOSTNAME="`hostname`"
 TRANSPORT="curl"
+LF=$'\n'
 unset DEBUG
 
 if [ -z "`which $TRANSPORT`" ] ; then
@@ -110,15 +111,15 @@ fi
 
 date=${LONGDATETIME#}
 if   [ $ageInDays -gt 0 ]; then
-	age="${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)"
+	age="Since   ${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)$LF"
 elif [ $ageInHours -gt 0 ]; then
-	age="${ageInHours}h $(($ageInMin-$ageInHours*60))min ($LONGDATETIME)"
+	age="Since   ${ageInHours}h $(($ageInMin-$ageInHours*60))m ($LONGDATETIME)$LF"
 elif [ $ageInMin -gt 0 ]; then
-	age="${ageInMin}min $(($ageInSec-$ageInMin*60))s"
+	age="Since   ${ageInMin}m $(($ageInSec-$ageInMin*60))s$LF"
 elif [ $ageInSec -gt 5 ]; then
-	age="${ageInSec}s"
-else
-	age="$LONGDATETIME"
+	age="Since   ${ageInSec}s$LF"
+elif [ $ageInSec -lt 0 ]; then
+	age="Since   $LONGDATETIME$LF"
 fi
 
 if [ "$HOSTALIAS" == "$HOSTDISPLAYNAME" ]; then
@@ -130,8 +131,7 @@ fi
 ## Build the message itself
 NOTIFICATION_MESSAGE=$(cat << EOF
 $HOSTSTATEICON<b>$HOSTDISPLAYNAME</b>$HOSTALIAS2 is $HOSTSTATE!
-Since   $age
-Info      $HOSTOUTPUT
+${age}Info      $HOSTOUTPUT
 IPv4     $HOSTADDRESS
 EOF
 )
@@ -150,7 +150,7 @@ fi
 ## Are we using Icinga Web 2? Put the URL into the message!
 if [ -n "$HAS_ICINGAWEB2" ] ; then
   NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
-<a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>Icinga Web</a>"
+<a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>$HAS_ICINGAWEB2</a>"
 fi
 
 ## Are we verbose? Then put a message to syslog...
diff --git a/service-by-telegram.sh b/service-by-telegram.sh
index d014caa..b0a43ec 100755
--- a/service-by-telegram.sh
+++ b/service-by-telegram.sh
@@ -114,28 +114,28 @@ fi
 
 date=${LONGDATETIME#}
 if   [ $ageInDays -gt 0 ]; then
-	age="${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)"
+	age=" since ${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)"
 elif [ $ageInHours -gt 0 ]; then
-	age="${ageInHours}h $(($ageInMin-$ageInHours*60))min ($LONGDATETIME)"
+	age=" since ${ageInHours}h $(($ageInMin-$ageInHours*60))m ($LONGDATETIME)"
 elif [ $ageInMin -gt 0 ]; then
-	age="${ageInMin}min $(($ageInSec-$ageInMin*60))s"
+	age=" since ${ageInMin}m $(($ageInSec-$ageInMin*60))s"
 elif [ $ageInSec -gt 5 ]; then
-	age="${ageInSec}s"
-else
-	age="$LONGDATETIME"
+	age=" since ${ageInSec}s"
+elif [ $ageInSec -lt 0 ]; then
+	age=" since $LONGDATETIME"
 fi
 
 
 ## Build the message itself
 NOTIFICATION_MESSAGE=$(cat << EOF
-$SERVICESTATEICON <b>$SERVICEDISPLAYNAME</b> is ${SERVICESTATE} since $age
-Host: <b>$HOSTALIAS</b> (IPv4 $HOSTADDRESS
+$SERVICESTATEICON <b>$SERVICEDISPLAYNAME</b> is ${SERVICESTATE}$age
+Host: <b>$HOSTALIAS</b> (IPv4 <code>$HOSTADDRESS</code>
 EOF
 )
 
 ## Is this host IPv6 capable?
 if [ -n "$HOSTADDRESS6" ] ; then
-  NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE, IPv6 $HOSTADDRESS6"
+  NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE, IPv6 <code>$HOSTADDRESS6</code>"
 fi
 NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE)"
 
@@ -145,7 +145,6 @@ More info: $SERVICEOUTPUT"
 ## Are there any comments? Put them into the message!
 if [ -n "$NOTIFICATIONCOMMENT" ] ; then
   NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
-
 Comment by $NOTIFICATIONAUTHORNAME:
   $NOTIFICATIONCOMMENT"
 fi
@@ -153,8 +152,7 @@ fi
 ## Are we using Icinga Web 2? Put the URL into the message!
 if [ -n "$HAS_ICINGAWEB2" ] ; then
   NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
-
-  <a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>Icinga Web</a>"
+<a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>$HAS_ICINGAWEB2</a>"
 fi
 
 ## Are we verbose? Then put a message to syslog...