diff --git a/lib/WebGUI/AssetAspect/Mailable.pm b/lib/WebGUI/AssetAspect/Mailable.pm
index 90bc717..5efa6c7 100644
--- a/lib/WebGUI/AssetAspect/Mailable.pm
+++ b/lib/WebGUI/AssetAspect/Mailable.pm
@@ -2,7 +2,7 @@ package WebGUI::AssetAspect::Mailable;
 
 use strict;
 use warnings;
-use Class::C3; 
+use Class::C3;
 
 use WebGUI::Macro;
 use Tie::IxHash;
@@ -115,13 +115,15 @@ sub processContentAsUser {
     $session->user( { userId => $userId } );
     $session->log->preventDebugOutput;
 
-    my $styleTemplateId = 
-           $configuration->{ styleTemplateId } 
-        || $self->get('mailStyleTemplateId') 
+    my $styleTemplateId =
+           $configuration->{ styleTemplateId }
+        || $self->get('mailStyleTemplateId')
         || $self->get('styleTemplateId');
 
+    $session->stow->set( 'mailing_rendering' => 1 );
+
     # Generate email body for this user
-    my $content = $session->style->process(   
+    my $content = $session->style->process(
         $self->generateEmailContent( $issueId, $configuration ),
         $styleTemplateId,
     );
@@ -129,10 +131,13 @@ sub processContentAsUser {
     # Process macros
     WebGUI::Macro::process( $session, \$content );
 
+    $session->stow->delete( 'mailing_rendering' );
+
     # Become ourselves again.
     $session->user( { userId => $currentUser->getId } );
     $var->switchAdminOn if $adminOn;
 
+
     return $content;
 }