diff --git a/server/ui-src/App.vue b/server/ui-src/App.vue
index 9991b86..4b5bf19 100644
--- a/server/ui-src/App.vue
+++ b/server/ui-src/App.vue
@@ -270,7 +270,7 @@ export default {
 				return message.To[i].Address;
 			}
 
-			return '[ Unknown ]';
+			return '[ Undisclosed recipients ]';
 		},
 
 		getRelativeCreated: function(message) {
diff --git a/server/ui-src/templates/Message.vue b/server/ui-src/templates/Message.vue
index 4befcb5..8cd0ac0 100644
--- a/server/ui-src/templates/Message.vue
+++ b/server/ui-src/templates/Message.vue
@@ -110,10 +110,11 @@ export default {
 				<tr class="small">
 					<th>To</th>
 					<td class="privacy">
-						<span v-for="(t, i) in message.To">
+						<span v-if="message.To" v-for="(t, i) in message.To">
 							<template v-if="i > 0">,</template>
 							{{ t.Name + " <" + t.Address +">" }}
 						</span>
+						<span v-else>Undisclosed recipients</span>
 					</td>
 				</tr>
 				<tr v-if="message.Cc" class="small">