diff --git a/framework/entity/BasicEntities.xml b/framework/entity/BasicEntities.xml
index d71b77fc5..811dd5ef8 100644
--- a/framework/entity/BasicEntities.xml
+++ b/framework/entity/BasicEntities.xml
@@ -554,6 +554,8 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="toUserId" type="id"/>
         <field name="emailTemplateId" type="id"><description>For outgoing messages that came from an EmailTemplate.</description></field>
         <field name="emailServerId" type="id"/>
+        <field name="sendAttemptCount" type="number-integer"/>
+        <field name="lastSendAttemptDate" type="date-time"/>
 
         <relationship type="one" title="EmailMessage" related="moqui.basic.StatusItem" short-alias="status"/>
         <relationship type="one" title="EmailType" related="moqui.basic.Enumeration" short-alias="type">
diff --git a/framework/service/org/moqui/impl/EmailServices.xml b/framework/service/org/moqui/impl/EmailServices.xml
index b08b328d4..b753b5153 100644
--- a/framework/service/org/moqui/impl/EmailServices.xml
+++ b/framework/service/org/moqui/impl/EmailServices.xml
@@ -26,6 +26,7 @@ along with this software (see the LICENSE.md file). If not, see
     </service>
     <service verb="send" noun="EmailMessage" type="script" location="classpath://org/moqui/impl/sendEmailMessage.groovy">
         <in-parameters><parameter name="emailMessageId" required="true"/></in-parameters>
+        <out-parameters><parameter name="messageId"/></out-parameters>
     </service>
 
     <service verb="poll" noun="EmailServer" authenticate="anonymous-all" type="script" transaction-timeout="600"
@@ -102,4 +103,69 @@ along with this software (see the LICENSE.md file). If not, see
             <service-call name="org.moqui.impl.EmailServices.send#EmailTemplate" in-map="context"/>
         </actions>
     </service>
+
+    <service verb="send" noun="PendingEmails">
+        <in-parameters>
+            <parameter name="maxLookBackDays" type="Integer" default="5"/>
+            <parameter name="maxSendAttempts" type="Integer" default="3"/>
+            <parameter name="minRetryDelaySeconds" type="Integer" default="90*60"/>
+            <parameter name="maxBatchSize" type="Integer" default="100"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="pendingTotal" type="Integer"/>
+            <parameter name="pendingToAttempt" type="Integer"/>
+            <parameter name="sendAttempts" type="Integer"/>
+            <parameter name="sendSuccessful" type="Integer"/>
+            <parameter name="sendFailed" type="Integer"/>
+        </out-parameters>
+        <actions>
+            <set field="sendAttempts" from="0"/>
+            <set field="sendSuccessful" from="0"/>
+            <set field="sendFailed" from="0"/>
+            <script>
+                Calendar cal = Calendar.instance
+                cal.add(Calendar.DAY_OF_MONTH, -maxLookBackDays)
+                emailUpdateFromDate = new Timestamp(cal.timeInMillis)
+                cal.setTimeInMillis(ec.user.nowTimestamp.time)
+                cal.add(Calendar.SECOND, -minRetryDelaySeconds)
+                lastAttemptThruDate = new Timestamp(cal.timeInMillis)
+            </script>
+            <entity-find-count entity-name="moqui.basic.email.EmailMessage" count-field="pendingTotal">
+                <econdition field-name="statusId" value="ES_READY"/>
+                <econdition field-name="lastUpdatedStamp" operator="greater-equals" from="emailUpdateFromDate"/>
+                <econdition field-name="sendAttemptCount" operator="less" from="maxSendAttempts" or-null="true"/>
+                <econdition field-name="fromAddress" operator="is-not-null"/>
+                <econdition field-name="toAddresses" operator="is-not-null"/>
+            </entity-find-count>
+            <entity-find-count entity-name="moqui.basic.email.EmailMessage" count-field="pendingToAttempt">
+                <econdition field-name="statusId" value="ES_READY"/>
+                <econdition field-name="lastUpdatedStamp" operator="greater-equals" from="emailUpdateFromDate"/>
+                <econdition field-name="lastSendAttemptDate" operator="less-equals" from="lastAttemptThruDate" or-null="true"/>
+                <econdition field-name="sendAttemptCount" operator="less" from="maxSendAttempts" or-null="true"/>
+                <econdition field-name="fromAddress" operator="is-not-null"/>
+                <econdition field-name="toAddresses" operator="is-not-null"/>
+            </entity-find-count>
+            <if condition="pendingToAttempt &gt; maxBatchSize"><set field="pendingToAttempt" from="maxBatchSize"/></if>
+            <entity-find entity-name="moqui.basic.email.EmailMessage" list="pendingList" limit="maxBatchSize">
+                <econdition field-name="statusId" value="ES_READY"/>
+                <econdition field-name="lastUpdatedStamp" operator="greater-equals" from="emailUpdateFromDate"/>
+                <econdition field-name="lastSendAttemptDate" operator="less-equals" from="lastAttemptThruDate" or-null="true"/>
+                <econdition field-name="sendAttemptCount" operator="less" from="maxSendAttempts" or-null="true"/>
+                <econdition field-name="fromAddress" operator="is-not-null"/>
+                <econdition field-name="toAddresses" operator="is-not-null"/>
+                <select-field field-name="emailMessageId,lastSendAttemptDate,lastUpdatedStamp,sendAttemptCount"/>
+                <order-by field-name="lastSendAttemptDate nulls first,lastUpdatedStamp,sendAttemptCount nulls first"/>
+            </entity-find>
+            <iterate list="pendingList" entry="pendingEmail">
+                <set field="sendAttempts" from="sendAttempts+1"/>
+                <service-call name="org.moqui.impl.EmailServices.send#EmailMessage" in-map="[emailMessageId:pendingEmail.emailMessageId]" out-map="sendResult" out-map-add-to-existing="false"/>
+                <if condition="sendResult.messageId"><then>
+                    <set field="sendSuccessful" from="sendSuccessful+1"/>
+                </then><else>
+                    <set field="sendFailed" from="sendFailed+1"/>
+                </else></if>
+            </iterate>
+        </actions>
+    </service>
+
 </services>
diff --git a/framework/src/main/resources/org/moqui/impl/sendEmailMessage.groovy b/framework/src/main/resources/org/moqui/impl/sendEmailMessage.groovy
index 2e0b1373c..30e58682f 100644
--- a/framework/src/main/resources/org/moqui/impl/sendEmailMessage.groovy
+++ b/framework/src/main/resources/org/moqui/impl/sendEmailMessage.groovy
@@ -149,6 +149,9 @@ try {
     } catch (Throwable t) {
         logger.error("Error in sendEmailTemplate", t)
         ec.message.addMessage("Error sending email: ${t.toString()}")
+        ec.service.sync().name("update", "moqui.basic.email.EmailMessage").requireNewTransaction(true)
+                .parameters([emailMessageId:emailMessageId, lastSendAttemptDate:ec.user.nowTimestamp, sendAttemptCount:((emailMessage.sendAttemptCount?:0)+1)])
+                .disableAuthz().call()
     }
 
     return