diff --git a/messages_v5.go b/messages_v5.go
index 80748cb3..a622d07f 100644
--- a/messages_v5.go
+++ b/messages_v5.go
@@ -551,15 +551,15 @@ func (m *plainMessageV5) isValid() bool {
 		return false
 	}
 
+	if m.from == "" {
+		return false
+	}
+
 	if m.template != "" {
 		// m.text or m.html not needed if template is supplied
 		return true
 	}
 
-	if m.from == "" {
-		return false
-	}
-
 	if m.text == "" && m.html == "" {
 		return false
 	}