diff --git a/fhem/FHEM/75_MSG.pm b/fhem/FHEM/75_MSG.pm
index e145460be..4024ad30f 100755
--- a/fhem/FHEM/75_MSG.pm
+++ b/fhem/FHEM/75_MSG.pm
@@ -1812,7 +1812,6 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
                                 # run command
                                 undef $@;
                                 if ( $cmd =~ s/^[ \t]*\{|\}[ \t]*$//gi ) {
-                                    $cmd =~ s/@\w+/\\$&/gi;
                                     Log3 $logDevice, 5,
 "msg $device: $type[$i] route command (Perl): $cmd";
                                     eval $cmd;
diff --git a/fhem/FHEM/msgSchema.pm b/fhem/FHEM/msgSchema.pm
index 709c8ad36..373eb714f 100755
--- a/fhem/FHEM/msgSchema.pm
+++ b/fhem/FHEM/msgSchema.pm
@@ -102,9 +102,9 @@ my $db = {
   'mail' => {
 
     'fhemMsgMail' => {
-      'Normal'  => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'%DEVICE%\'")}',
-      'High'    => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'[High] %TITLE%\' \'%DEVICE%\'")}',
-      'Low'     => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'[Low] %TITLE%\' \'%DEVICE%\'")}',
+      'Normal'  => '{ my $dev=\'%DEVICE%\'; system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'$dev\'"); }',
+      'High'    => '{ my $dev=\'%DEVICE%\'; system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'$dev\'"); }',
+      'Low'     => '{ my $dev=\'%DEVICE%\'; system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'$dev\'"); }',
     },
 
   },