diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index ef99acc00d7..89db6671356 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1209,7 +1209,6 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro
 
     $posttext .= "\n";
     $posttext .= $CFG->wwwroot.'/mod/forum/discuss.php?d='.$discussion->id;
-    $posttext .= "\n---------------------------------------------------------------------\n";
     $posttext .= format_string($post->subject,true);
     if ($bare) {
         $posttext .= " ($CFG->wwwroot/mod/forum/discuss.php?d=$discussion->id#p$post->id)";
@@ -1219,10 +1218,10 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro
     $posttext .= format_text_email($post->message, $post->messageformat);
     $posttext .= "\n\n";
     $posttext .= forum_print_attachments($post, $cm, "text");
+    $posttext .= "\n---------------------------------------------------------------------\n";
 
     if (!$bare) {
         if ($canreply) {
-            $posttext .= "---------------------------------------------------------------------\n";
             $posttext .= get_string("postmailinfo", "forum", $shortname)."\n";
             $posttext .= "$CFG->wwwroot/mod/forum/post.php?reply=$post->id\n";
         }
@@ -1230,18 +1229,15 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro
         if ($canunsubscribe) {
             if (\mod_forum\subscriptions::is_subscribed($userto->id, $forum, null, $cm)) {
                 // If subscribed to this forum, offer the unsubscribe link.
-                $posttext .= "\n---------------------------------------------------------------------\n";
                 $posttext .= get_string("unsubscribe", "forum");
                 $posttext .= ": $CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\n";
             }
             // Always offer the unsubscribe from discussion link.
-            $posttext .= "\n---------------------------------------------------------------------\n";
             $posttext .= get_string("unsubscribediscussion", "forum");
             $posttext .= ": $CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id&d=$discussion->id\n";
         }
     }
 
-    $posttext .= "\n---------------------------------------------------------------------\n";
     $posttext .= get_string("digestmailpost", "forum");
     $posttext .= ": {$CFG->wwwroot}/mod/forum/index.php?id={$forum->course}\n";