diff --git a/sites/all/modules/contrib/message/includes/message.message.inc b/sites/all/modules/contrib/message/includes/message.message.inc
index cb9d7f6..878b67d 100644
--- a/sites/all/modules/contrib/message/includes/message.message.inc
+++ b/sites/all/modules/contrib/message/includes/message.message.inc
@@ -229,7 +229,7 @@ class Message extends Entity {
     }
 
     $context = array('message' => $this);
-    $token_options = !empty($this->data['token options']) ? $this->data['token options'] : array();
+    $token_options = message_get_property_values($this, 'data', 'token options');
 
     $message_type = $this->getType();