diff --git a/server/ui-src/components/message/Message.vue b/server/ui-src/components/message/Message.vue
index 57616f4..eb2c67a 100644
--- a/server/ui-src/components/message/Message.vue
+++ b/server/ui-src/components/message/Message.vue
@@ -293,7 +293,8 @@ export default {
 								</span>
 							</td>
 						</tr>
-						<tr v-if="message.ReturnPath && message.ReturnPath != message.From.Address" class="small">
+						<tr v-if="message.ReturnPath && message.From && message.ReturnPath != message.From.Address"
+							class="small">
 							<th class="text-nowrap">Return-Path</th>
 							<td class="privacy text-body-secondary text-break">
 								&lt;<a :href="searchURI(message.ReturnPath)" class="text-body-secondary">
diff --git a/server/ui-src/components/message/Release.vue b/server/ui-src/components/message/Release.vue
index 9491a27..12a9043 100644
--- a/server/ui-src/components/message/Release.vue
+++ b/server/ui-src/components/message/Release.vue
@@ -89,7 +89,7 @@ export default {
 						<label class="col-sm-2 col-form-label text-body-secondary">From</label>
 						<div class="col-sm-10">
 							<input type="text" aria-label="From address" readonly class="form-control-plaintext"
-								:value="message.From.Address">
+								:value="message.From ? message.From.Address : ''">
 						</div>
 					</div>
 					<div class="row">
diff --git a/server/ui-src/views/MessageView.vue b/server/ui-src/views/MessageView.vue
index 6bf72c7..f19c7bd 100644
--- a/server/ui-src/views/MessageView.vue
+++ b/server/ui-src/views/MessageView.vue
@@ -341,6 +341,6 @@ export default {
 
 	<AboutMailpit modals />
 	<AjaxLoader :loading="loading" />
-	<Release v-if="message" ref="ReleaseRef" :message="message" @delete="deleteMessage" />
+	<Release v-if="mailbox.uiConfig.MessageRelay && message" ref="ReleaseRef" :message="message" @delete="deleteMessage" />
 	<Screenshot v-if="message" ref="ScreenshotRef" :message="message" />
 </template>