diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 3c077a28..886e359b 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -55,7 +55,8 @@ sub view_build : Chained('build') PathPart('') Args(0) {
     (my $lastBuildStep) = $build->buildsteps->search({},{order_by => "stepnr DESC", rows => 1});
     my $path = defined $lastBuildStep ? $lastBuildStep->logfile : "" ;
     if (defined $build->resultInfo && ($build->resultInfo->buildstatus == 1 || $build->resultInfo->buildstatus == 6) && !($path eq "") && -f $lastBuildStep->logfile) {
-	$c->stash->{logtext} = removeAsciiEscapes(`tail -n 50 $path`);
+	my $logtext = `tail -n 50 $path`;
+        $c->stash->{logtext} = removeAsciiEscapes($logtext);
     }
 
     if($build->finished) {
diff --git a/src/script/hydra_build.pl.in b/src/script/hydra_build.pl.in
index a3b66dcc..96c64dea 100755
--- a/src/script/hydra_build.pl.in
+++ b/src/script/hydra_build.pl.in
@@ -156,7 +156,8 @@ sub sendEmailNotification {
 
     my $loglines = 50;
     my $logfile = $build->resultInfo->logfile;
-    my $logtext = defined $logfile && -e $logfile ? removeAsciiEscapes(`tail -$loglines $logfile`) : "No logfile available.\n";
+    my $logtext = defined $logfile && -e $logfile ? `tail -$loglines $logfile` : "No logfile available.\n";
+    $logtext = removeAsciiEscapes($logtext);
 
     my $body = "Hi,\n"
         . "\n"