From 76b92592b9d2315740e77afeeca284642464db9d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 26 Oct 2015 17:28:32 -0400
Subject: [PATCH] CRM-16665 - Fix inappropriate tpl inclusion

---
 templates/CRM/Contact/Form/Task/Email.tpl       | 1 +
 templates/CRM/Contact/Form/Task/EmailCommon.tpl | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl
index 4491597f70..76c2e87ad1 100644
--- a/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/templates/CRM/Contact/Form/Task/Email.tpl
@@ -82,6 +82,7 @@
 </table>
 
 {include file="CRM/Contact/Form/Task/EmailCommon.tpl"}
+{include file="CRM/Activity/Form/FollowUp.tpl" type='email-'}
 
 <div class="spacer"> </div>
 
diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.tpl b/templates/CRM/Contact/Form/Task/EmailCommon.tpl
index 6edc17d636..39f39503e1 100644
--- a/templates/CRM/Contact/Form/Task/EmailCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.tpl
@@ -78,5 +78,3 @@
 {/if}
 
 {include file="CRM/Mailing/Form/InsertTokens.tpl"}
-
-{include file="CRM/Activity/Form/FollowUp.tpl" type='email-'}
\ No newline at end of file
-- 
2.25.1