2 files changed, 3 insertions, 17 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm
index 6def423ce..c457c8fce 100644
--- a/perllib/FixMyStreet/App/Controller/Location.pm
+++ b/perllib/FixMyStreet/App/Controller/Location.pm
@@ -134,22 +134,6 @@ sub check_location : Private {
     return 1;
 }
 
-=head2 country_message
-
-Displays the country_message template, used for displaying a message to
-people using the site from outside the host country.
-
-=cut
-
-sub country_message : Path('/country_message') : Args(0) {
-    my ( $self, $c ) = @_;
-
-    # we do not want to cache this as we always want to check if displaying this
-    # is the right thing to do.
-    $c->res->header( 'Cache_Control' => 'max-age=0' );
-    $c->stash->{template} = 'front/international_banner.html';
-}
-
 # Utility function for if someone (rarely) enters a grid reference
 sub gridref_to_latlon {
     my ( $a, $b, $num ) = @_;
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 66dc20a3a..f9762662c 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -655,8 +655,10 @@ sub setup_categories_and_bodies : Private {
                 $category_extras{ $contact->category } = $metas
                     if scalar @$metas;
 
+                my $body_send_method = $bodies{$contact->body_id}->send_method || '';
                 $c->stash->{unresponsive}{$contact->category} = $contact->body_id
-                    if $contact->email =~ /^REFUSED$/i;
+                    if !$c->stash->{unresponsive}{ALL} &&
+                        ($contact->email =~ /^REFUSED$/i || $body_send_method eq 'Refused');
 
                 $non_public_categories{ $contact->category } = 1 if $contact->non_public;
             }