diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index d84f9c940..15eaabb07 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -11,6 +11,7 @@ use Time::HiRes qw(gettimeofday);
#########################
# Forward declaration
sub FW_IconURL($);
+sub FW_addContent(;$);
sub FW_addToWritebuffer($$@);
sub FW_answerCall($);
sub FW_dev2image($;$);
@@ -976,7 +977,7 @@ FW_answerCall($)
$FW_cmdret = "
";
+ FW_addContent();
if($FW_ss) {
FW_pO "
$FW_cmdret
";
} else {
@@ -1007,7 +1008,7 @@ FW_answerCall($)
my $motd = AttrVal("global","motd","none");
if($motd ne "none") {
$motd =~ s/\n/
/g;
- FW_pO "
$motd
";
+ FW_addContent('>$motd
";
+}
+
sub
FW_addLinks($)
{
@@ -1263,10 +1274,7 @@ FW_doDetail($)
my $h = $defs{$d};
my $t = $h->{TYPE};
$t = "MISSING" if(!defined($t));
- FW_pO "";
+ FW_addContent();
if($FW_ss) { # FS20MS2 special: on and off, is not the same as toggle
my $webCmd = AttrVal($d, "webCmd", undef);
@@ -1673,7 +1681,7 @@ FW_showRoom()
FW_pO "