diff --git a/src/Message.php b/src/Message.php
index 9208be079e60110ac181f6bf99071f6013b7c9ab..486d9df5faf3dcbd68a1af34535bc646707fce0a 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -80,7 +80,7 @@ class Message implements MessageInterface
      */
     public function getContent(GatewayInterface $gateway = null)
     {
-        return $this->content;
+        return is_callable($this->content) ? $this->content($gateway) : $this->content;
     }
 
     /**
@@ -92,7 +92,7 @@ class Message implements MessageInterface
      */
     public function getTemplate(GatewayInterface $gateway = null)
     {
-        return $this->template;
+        return is_callable($this->template) ? $this->template($gateway): $this->template;
     }
 
     /**