diff --git a/src/MiniDocs/Markdown.class.st b/src/MiniDocs/Markdown.class.st
index f9bea0c..13bb9c7 100644
--- a/src/MiniDocs/Markdown.class.st
+++ b/src/MiniDocs/Markdown.class.st
@@ -64,7 +64,10 @@ Markdown >> containsYAMLMetadataClosing [
 Markdown >> contents [
 	| response |
 	response := WriteStream on: ''.
-	response 
+	response
+		nextPutAll: '---'; cr;
+		nextPutAll: self metadataAsYAML; cr;
+		nextPutAll: '---'; cr;
 		nextPutAll: self body.
 	^ response contents
 ]
@@ -177,7 +180,8 @@ Markdown >> file: aFileReference [
 Markdown >> fromFile: aFileReference [
 	self contents: aFileReference contents.
 	self file: aFileReference.
-	self populateMetadata
+	self populateMetadata.
+	self body: self contentsWithoutYAMLMetadata
 ]
 
 { #category : #'instance creation' }