diff --git a/C4/Letters.pm b/C4/Letters.pm
index 8a49010673..5041ddc119 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -1130,7 +1130,7 @@ sub ResendMessage {
 
     my $message = GetMessage( $message_id );
     return unless $message;
-    if ( $message->{status} eq 'failed' ) {
+    if ( $message->{status} ne 'pending' ) {
         return ((C4::Letters::_set_message_status( {
                     message_id => $message_id,
                     status => 'pending',
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index d4aa4b72fb..6572e6c7ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -71,9 +71,19 @@
 		<td>
             [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
             [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
-            [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed <div class="notice"><a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]&amp;op=resend_notice&amp;message_id=[% QUEUED_MESSAGE.message_id %]" title="Attempt to resend the notice">Resend</a></div>
+            [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
             [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
             [% ELSE %][% QUEUED_MESSAGE.status %][% END %]
+            [% IF ( QUEUED_MESSAGE.status != 'pending' ) %]
+            <div class="notice">
+                <form action="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]" method="POST">
+                    <input type="hidden" name="op" value="resend_notice" />
+                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+                    <input type="hidden" name="message_id" value="[% QUEUED_MESSAGE.message_id %]" />
+                    <a href="#" onclick="$(this).closest('form').submit();return false;" title="Attempt to resend the notice">Resend</a>
+                </form>
+            </div>
+            [% END %]
         </td>
         <td><span title="[% QUEUED_MESSAGE.time_queued %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</span></td>
 	    </tr>
diff --git a/members/notices.pl b/members/notices.pl
index 1f7cce9828..33b4be95e6 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -56,6 +56,8 @@ if ( $op eq 'resend_notice' ) {
     my $message = C4::Letters::GetMessage( $message_id );
     if ( $message->{borrowernumber} = $borrowernumber ) {
         C4::Letters::ResendMessage( $message_id );
+        # redirect to self to avoid form submission on refresh
+        print $input->redirect("/cgi-bin/koha/members/notices.pl?borrowernumber=$borrowernumber");
     }
 }