6 files changed, 2 insertions, 14 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 2e2bf3890..1664f0f30 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -336,7 +336,7 @@ sub send_email {
         {
             _template_ => $email->body,    # will get line wrapped
             _parameters_ => {},
-            _line_indent => $c->cobrand->email_indent,
+            _line_indent => '',
             $email->header_pairs
         }
     ) };
@@ -366,6 +366,7 @@ sub send_email_cron {
     #    }
     #);
 
+    $params->{_line_indent} = '';
     my $email = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email($params) };
 
     if ( FixMyStreet->test_mode ) {
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index a39a98135..832a6bb5c 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -832,14 +832,6 @@ sub prettify_dt {
     return Utils::prettify_dt( $dt, 1 );
 }
 
-=head2 email_indent
-
-Set to an indent string if you wish to override the default email handling.
-
-=cut
-
-sub email_indent { undef; }
-
 sub problem_as_hashref {
     my $self = shift;
     my $problem = shift;
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 0a05fe835..087d9046b 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -278,8 +278,6 @@ sub set_problem_state {
     $c->forward( 'log_edit', [ $problem->id, 'problem', "state change to $new_state" ] );
 }
 
-sub email_indent { ''; }
-
 # Specific administrative displays
 
 sub admin_pages {
diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
index cc4fc67fc..8e18832a9 100644
--- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
@@ -243,7 +243,6 @@ sub _send_aggregated_alert_email(%) {
         {
             _template_ => $template,
             _parameters_ => \%data,
-            _line_indent => $cobrand->email_indent,
             From => [ $sender, _($cobrand->contact_name) ],
             To => $data{alert_email},
         },
diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
index c85ecbf3a..6f2c19b5e 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
@@ -102,7 +102,6 @@ sub send_questionnaires_period {
             {
                 _template_ => $template,
                 _parameters_ => \%h,
-                _line_indent => $cobrand->email_indent,
                 To => [ [ $row->user->email, $row->name ] ],
                 From => [ $sender, $sender_name ],
             },
diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index e8151f175..d71700020 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -97,7 +97,6 @@ sub send {
         {
             _template_ => $self->get_template( $row ),
             _parameters_ => $h,
-            _line_indent => $row->cobrand eq 'zurich' ? '' : undef, # XXX Access to Cobrand module here?
             To => $self->to,
             From => $self->send_from( $row ),
         },