2 files changed, 10 insertions, 2 deletions
diff --git a/commands/account/next.go b/commands/account/next.go
index b54ed0c1..92624316 100644
--- a/commands/account/next.go
+++ b/commands/account/next.go
@@ -77,7 +77,11 @@ func (np NextPrevMsg) Execute(args []string) error {
 						app.PushError(err.Error())
 						return
 					}
-					nextMv := app.NewMessageViewer(acct, view)
+					nextMv, err := app.NewMessageViewer(acct, view)
+					if err != nil {
+						app.PushError(err.Error())
+						return
+					}
 					app.ReplaceTab(mv, nextMv,
 						nextMsg.Envelope.Subject, true)
 				})
diff --git a/commands/account/view.go b/commands/account/view.go
index 58450044..5f5bd289 100644
--- a/commands/account/view.go
+++ b/commands/account/view.go
@@ -61,7 +61,11 @@ func (v ViewMessage) Execute(args []string) error {
 				app.PushError(err.Error())
 				return
 			}
-			viewer := app.NewMessageViewer(acct, view)
+			viewer, err := app.NewMessageViewer(acct, view)
+			if err != nil {
+				app.PushError(err.Error())
+				return
+			}
 			data := state.NewDataSetter()
 			data.SetAccount(acct.AccountConfig())
 			data.SetFolder(acct.Directories().SelectedDirectory())