diff --git a/announcement/plugin.jelly b/announcement/plugin.jelly
index 28f4f2f3..8b32c232 100644
--- a/announcement/plugin.jelly
+++ b/announcement/plugin.jelly
@@ -42,7 +42,11 @@
 
     <!-- If from email address is empty, find the first non empty email 
          address from the POM. -->
-    <j:if test="${context.getVariable('maven.announcement.mail.from') == null}">
+    <maven:get
+        var="maven.announcement.mail.from"
+        plugin="maven-announcement-plugin"
+        property="maven.announcement.mail.from"/>
+    <j:if test="${maven.announcement.mail.from == null}">
        <j:forEach var="developer" items="${pom.developers}">
           <j:if test="${not empty(developer.email)}">
              <j:set var="maven.announcement.mail.from" value="${developer.email}"/>
@@ -213,8 +217,12 @@
       <maven:param-check value="${maven.announcement.mail.to}" fail="true">The To address must be specified using the maven.announcement.mail.to property</maven:param-check> 
       
       <!-- Resolve dynamic %% templates from maven.announcement.mail.subject -->
+      <maven:get
+        var="maven.announcement.mail.subject"
+        plugin="maven-announcement-plugin"
+        property="maven.announcement.mail.subject"/>
       <j:set var="maven.announcement.mail.subject"
-          value="${stringUtils.replace(context.getVariable('maven.announcement.mail.subject'), '%VERSION%', versionVariable)}"/>
+          value="${stringUtils.replace(maven.announcement.mail.subject, '%VERSION%', versionVariable)}"/>
       
       <echo>Sending mail using SMTP server "${maven.announcement.mail.server}", client ${maven.announcement.mail.client} and subject "${maven.announcement.mail.subject}"...</echo>
       <echo>Sending from "${maven.announcement.mail.from}" to "${maven.announcement.mail.to}"...</echo>