diff --git a/src/components/ItemBodyView/ItemBodyView.js b/src/components/ItemBodyView/ItemBodyView.js
index 164f050..943d052 100644
--- a/src/components/ItemBodyView/ItemBodyView.js
+++ b/src/components/ItemBodyView/ItemBodyView.js
@@ -37,7 +37,8 @@ export default function ItemBodyView({ item }) {
 			case "initial_message":
 				return (
 					<>
-						<EmailHeader name={section.userName} date={section.datetime} email={section.userEmail} />
+						{console.log("Initial Message: ", section)}
+						<EmailHeader {...section} />
 						{section.content.map((line, index) => <Typography variant="body1">{line}</Typography>)}
 					</>
 				);
diff --git a/src/components/ItemMetadataView/ItemMetadataView.js b/src/components/ItemMetadataView/ItemMetadataView.js
index 62b7fe6..0ed03c7 100644
--- a/src/components/ItemMetadataView/ItemMetadataView.js
+++ b/src/components/ItemMetadataView/ItemMetadataView.js
@@ -35,7 +35,7 @@ export default function ItemMetadataView({item}){
 				{item.subject}
 			</Typography>
 
-			<EmailHeader name={item.userName} date={item.dateReceived} email={item.userEmail} />
+			<EmailHeader from_name={item.userName} datetime={item.dateReceived} from_email={item.userEmail} />
 
 			<Alert severity="info" classes={{root: classes.verticalSpacing}}>
 				Status, assignments, priority, refile, archive and delete controls coming soon to a theater near you.