diff --git a/stylesheets/components/MessageDetail.scss b/stylesheets/components/MessageDetail.scss
index 9fed6e54aa9..e9e63c5626c 100644
--- a/stylesheets/components/MessageDetail.scss
+++ b/stylesheets/components/MessageDetail.scss
@@ -24,6 +24,8 @@
 
 .module-message-detail__label {
   @include font-body-1-bold;
+
+  min-width: 72px;
 }
 
 .module-message-detail__unix-timestamp {
diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index ff43c8f473b..31e355d6f84 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -1610,7 +1610,9 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     const promises: Array<Promise<unknown>> = [];
 
     let errors: Array<CustomError>;
-    if (isCustomError(result.value)) {
+    if (result.value instanceof SendMessageProtoError && result.value.errors) {
+      ({ errors } = result.value);
+    } else if (isCustomError(result.value)) {
       errors = [result.value];
     } else if (Array.isArray(result.value.errors)) {
       ({ errors } = result.value);