diff --git a/Mf2/Parser.php b/Mf2/Parser.php
index 0dc5069..63a85b0 100644
--- a/Mf2/Parser.php
+++ b/Mf2/Parser.php
@@ -887,7 +887,7 @@ public function parseE(\DOMElement $e) {
 		}
 
 		$return = array(
-			'html' => $html,
+			'html' => unicodeTrim($html),
 			'value' => unicodeTrim($this->innerText($e)),
 		);
 
diff --git a/tests/Mf2/ParserTest.php b/tests/Mf2/ParserTest.php
index 2780184..904866a 100644
--- a/tests/Mf2/ParserTest.php
+++ b/tests/Mf2/ParserTest.php
@@ -106,6 +106,20 @@ public function testParseEWithBR() {
 		$this->assertEquals('Here is content with two lines.'."\n".'The br tag should not be converted to an XML br/br element.', $output['items'][0]['properties']['content'][0]['value']);
 	}
 
+	public function testParseEWithWhitespace() {
+		$input = '<div class="h-entry">
+  <div class="e-content">
+    This <strong>leading and trailing whitespace</strong> should be removed from the HTML and text values.
+  </div>
+</div>';
+		//$parser = new Parser($input);
+		$output = Mf2\parse($input);
+
+		$this->assertArrayHasKey('content', $output['items'][0]['properties']);
+		$this->assertEquals('This <strong>leading and trailing whitespace</strong> should be removed from the HTML and text values.', $output['items'][0]['properties']['content'][0]['html']);
+		$this->assertEquals('This leading and trailing whitespace should be removed from the HTML and text values.', $output['items'][0]['properties']['content'][0]['value']);
+	}
+
 	/**
 	 * @group parseH
 	 */