diff --git a/forward.module b/forward.module
index bc1bcdd..125810a 100644
--- a/forward.module
+++ b/forward.module
@@ -1512,9 +1512,14 @@ function _forward_show_on_entity($entity_type, $entity, $bundle) {
  * Build the message main body for an entity based on a given view mode and language
  */
 function _forward_build_message_content($entity_type, $entity, $entity_id, $view_mode, $langcode) {
-  field_attach_prepare_view($entity_type, array($entity_id => $entity), $view_mode);
-  entity_prepare_view($entity_type, array($entity_id => $entity));
-  $content_array = field_attach_view($entity_type, $entity, $view_mode, $langcode);
+  if ($entity_type == 'node') {
+    $content_array = node_view($entity, $view_mode);
+  }
+  else {
+    field_attach_prepare_view($entity_type, array($entity_id => $entity), $view_mode);
+    entity_prepare_view($entity_type, array($entity_id => $entity));
+    $content_array = field_attach_view($entity_type, $entity, $view_mode, $langcode);
+  }
   $content = render($content_array);
   return $content;
 }
