diff --git a/src/EmailContent.tsx b/src/EmailContent.tsx
index 445f552..953d043 100644
--- a/src/EmailContent.tsx
+++ b/src/EmailContent.tsx
@@ -1,5 +1,7 @@
 import Button from "react-bootstrap/Button";
+import Col from "react-bootstrap/Col";
 import Container from "react-bootstrap/Container";
+import Form from "react-bootstrap/Form";
 import Placeholder from "react-bootstrap/Placeholder";
 import React from "react";
 import Row from "react-bootstrap/Row";
@@ -65,6 +67,30 @@ class EmailContent extends React.Component<
 		}
 		return (
 			<Container fluid>
+				<Row>
+					<Form>
+						<Form.Group
+							as={Row}
+							className="mb-3"
+							controlId="formHorizontalEmail"
+						>
+							<Form.Label column sm={2}>
+								From
+							</Form.Label>
+							<Col sm={10}>
+								<p>
+									{email.from == null
+										? "unknown"
+										: email.from.map((f) => f.name)}
+								</p>
+							</Col>
+							<Form.Label column sm={2}>
+								Received
+							</Form.Label>
+							<Col sm={10}>{email.receivedAt}</Col>
+						</Form.Group>
+					</Form>
+				</Row>
 				<Row>
 					<Button
 						onClick={() => {
diff --git a/src/EmailContentText.tsx b/src/EmailContentText.tsx
index e8b60a3..5fe4718 100644
--- a/src/EmailContentText.tsx
+++ b/src/EmailContentText.tsx
@@ -18,7 +18,6 @@ const EmailContentText: React.FC<EmailContentTextProps> = (props) => {
 	}
 	return (
 		<Stack>
-			<li>{email.receivedAt}</li>
 			<pre>
 				{email.textBody.map((t) =>
 					t.partId === undefined ? (