diff --git a/lib/NGCP/Panel/Controller/EmailTemplate.pm b/lib/NGCP/Panel/Controller/EmailTemplate.pm
index bbbdd20370..be4953ae4f 100644
--- a/lib/NGCP/Panel/Controller/EmailTemplate.pm
+++ b/lib/NGCP/Panel/Controller/EmailTemplate.pm
@@ -38,6 +38,8 @@ sub tmpl_list :Chained('/') :PathPart('emailtemplate') :CaptureArgs(0) {
         { name => 'subject', search => 1, title => $c->loc('Subject') },
     ]);
 
+    $c->stash->{email_template_external_filter} = $c->session->{email_template_external_filter};
+
     $c->stash(template => 'emailtemplate/list.tt');
 }
 
@@ -50,18 +52,37 @@ sub tmpl_ajax :Chained('tmpl_list') :PathPart('ajax') :Args(0) {
 
     my $rs = $c->stash->{tmpl_rs};
     NGCP::Panel::Utils::Datatables::process($c, $rs, $c->stash->{template_dt_columns});
-
+    $c->session->{email_template_external_filter} = 'all';
     $c->detach( $c->view("JSON") );
 }
 
 sub tmpl_ajax_reseller :Chained('tmpl_list') :PathPart('ajax') :Args(1) {
     my ($self, $c, $reseller_id) = @_;
-
     my $rs = $c->stash->{tmpl_rs}->search({
         reseller_id => $reseller_id,
     });
     NGCP::Panel::Utils::Datatables::process($c, $rs, $c->stash->{template_dt_columns});
+    $c->detach( $c->view("JSON") );
+}
 
+sub tmpl_ajax_default :Chained('tmpl_list') :PathPart('ajax/default') :Args(0) {
+    my ($self, $c) = @_;
+    my $rs = $c->model('DB')->resultset('email_templates')->search({
+        'me.reseller_id' => undef,
+    });
+    my $dt_columns = NGCP::Panel::Utils::Datatables::set_columns($c, [
+            { name => 'id', search => 1, title => $c->loc('#') },
+            { name => 'name', search => 1, title => $c->loc('Name') },
+            { name => 'from_email', search => 1, title => $c->loc('From') },
+            { name => 'subject', search => 1, title => $c->loc('Subject') },
+        ]);
+    NGCP::Panel::Utils::Datatables::process($c, $rs, $dt_columns, sub {
+            my ($result) = @_;
+            my %data = (undeletable => ($c->user->roles eq "admin") ? 0 : 1);
+            return %data
+        },
+    );
+    $c->session->{email_template_external_filter} = 'default';
     $c->detach( $c->view("JSON") );
 }
 
@@ -90,35 +111,9 @@ sub tmpl_create :Chained('tmpl_list') :PathPart('create') :Args(0) {
         },
         back_uri => $c->req->uri,
     );
-    if($posted && $form->validated) {
-        try {
-            if($c->user->roles eq "admin") {
-                $form->values->{reseller_id} = $form->values->{reseller}{id};
-            } elsif($c->user->roles eq "reseller") {
-                $form->values->{reseller_id} = $c->user->reseller_id;
-            }
-            delete $form->values->{reseller};
-
-            my $schema = $c->model('DB');
-            $schema->txn_do(sub {
-                my $tmpl = $c->stash->{tmpl_rs}->create($form->values);
-            });
-
-            delete $c->session->{created_objects}->{reseller};
-            NGCP::Panel::Utils::Message::info(
-                c    => $c,
-                desc => $c->loc('Email template successfully created'),
-            );
-        } catch($e) {
-            NGCP::Panel::Utils::Message::error(
-                c     => $c,
-                error => $e,
-                desc  => $c->loc('Failed to create email template'),
-            );
-        }
-        NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/emailtemplate'));
+    if($posted) {
+        $self->create_email_template($c, $form);
     }
-
     $c->stash(
         form => $form,
         create_flag => 1,
@@ -131,19 +126,12 @@ sub tmpl_base :Chained('tmpl_list') :PathPart('') :CaptureArgs(1) {
     $c->detach('/denied_page')
         if($c->user->read_only);
 
-    unless($tmpl_id && is_int($tmpl_id)) {
-        NGCP::Panel::Utils::Message::error(
-            c => $c,
-            log => 'Invalid email template id detected',
-            desc => $c->log('Invalid email template id detected'),
-        );
-        $c->response->redirect($c->uri_for());
-        $c->detach;
+    unless ( $self->check_template_id($c, $tmpl_id) ) {
         return;
     }
 
-    my $res = $c->stash->{tmpl_rs}->find($tmpl_id); 
-    unless(defined($res)) {
+    my $rs = $c->stash->{tmpl_rs}->find($tmpl_id);
+    unless(defined($rs)) {
         NGCP::Panel::Utils::Message::error(
             c => $c,
             log => 'Email template does not exist',
@@ -154,7 +142,7 @@ sub tmpl_base :Chained('tmpl_list') :PathPart('') :CaptureArgs(1) {
         return;
     }
 
-    $c->stash->{tmpl} = $res;
+    $c->stash->{tmpl} = $rs;
 }
 
 sub tmpl_delete :Chained('tmpl_base') :PathPart('delete') {
@@ -166,7 +154,7 @@ sub tmpl_delete :Chained('tmpl_base') :PathPart('delete') {
                 $_ => $c->stash->{tmpl}->id,
             })->update({
                 $_ => undef,
-            });        
+            });
         }
         $c->stash->{tmpl}->delete;
         NGCP::Panel::Utils::Message::info(
@@ -186,17 +174,89 @@ sub tmpl_delete :Chained('tmpl_base') :PathPart('delete') {
 
 sub tmpl_edit :Chained('tmpl_base') :PathPart('edit') {
     my ($self, $c) = @_;
+    my ($posted, $form, $params) = $self->prepare_email_template_edit($c);
+    if($posted && $form->validated) {
+        try {
+            if($c->user->roles eq "admin") {
+                $form->values->{reseller_id} = $form->values->{reseller}{id};
+            } elsif($c->user->roles eq "reseller") {
+                # don't allow to change reseller id
+            }
+            delete $form->values->{reseller};
+            $c->model('DB')->txn_do(sub {
+                $c->stash->{tmpl}->update($form->values);
 
+            });
+            delete $c->session->{created_objects}->{reseller};
+            NGCP::Panel::Utils::Message::info(
+                c    => $c,
+                desc => $c->loc('Email template successfully updated'),
+            );
+        } catch($e) {
+            NGCP::Panel::Utils::Message::error(
+                c     => $c,
+                error => $e,
+                desc  => $c->loc('Failed to update email template'),
+            );
+        };
+        NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/emailtemplate'));
+    }
+
+    $c->stash(
+        form => $form,
+        edit_flag => 1,
+    );
+}
+
+sub tmpl_copy :Chained('tmpl_list') :PathPart('copy'): Args(1) {
+    my ($self, $c, $tmpl_id) = @_;
+
+    $c->detach('/denied_page')
+        if($c->user->read_only);
+
+    unless ( $self->check_template_id($c, $tmpl_id) ) {
+        return;
+    }
+
+    my $tmpl = $c->model('DB')->resultset('email_templates')->find($tmpl_id);
+    my ($posted, $form, $params) = $self->prepare_email_template_edit($c, $tmpl);
+    if($posted) {
+        $self->create_email_template($c, $form);
+    }
+    $c->stash(
+        form => $form,
+        create_flag => 1,
+    );
+}
+
+sub check_template_id :Private {
+    my ($self, $c, $tmpl_id) = @_;
+    unless($tmpl_id && is_int($tmpl_id)) {
+        NGCP::Panel::Utils::Message::error(
+            c => $c,
+            log => 'Invalid email template id detected',
+            desc => $c->log('Invalid email template id detected'),
+        );
+        $c->response->redirect($c->uri_for());
+        $c->detach;
+        return;
+    }
+    return 1;
+}
+
+sub prepare_email_template_edit :Private {
+    my ($self, $c, $tmpl) = @_;
     my $posted = ($c->request->method eq 'POST');
     my $form;
-    my $params = { $c->stash->{tmpl}->get_inflated_columns };
+    $tmpl //= $c->stash->{tmpl};
+    my $params = { $tmpl->get_inflated_columns };
     $params->{reseller}{id} = delete $params->{reseller_id};
     $params = merge($params, $c->session->{created_objects});
     if($c->user->roles eq "admin") {
         $form = NGCP::Panel::Form::get("NGCP::Panel::Form::EmailTemplate::Admin", $c);
     } elsif($c->user->roles eq "reseller") {
         $form = NGCP::Panel::Form::get("NGCP::Panel::Form::EmailTemplate::Reseller", $c);
-    } 
+    }
     $form->process(
         posted => $posted,
         params => $c->request->params,
@@ -210,40 +270,40 @@ sub tmpl_edit :Chained('tmpl_base') :PathPart('edit') {
         },
         back_uri => $c->req->uri,
     );
-    if($posted && $form->validated) {
+    return $posted, $form, $params;
+}
+sub create_email_template :Private {
+    my ($self, $c, $form) = @_;
+    if($form->validated) {
         try {
             if($c->user->roles eq "admin") {
                 $form->values->{reseller_id} = $form->values->{reseller}{id};
             } elsif($c->user->roles eq "reseller") {
-                # don't allow to change reseller id
+                $form->values->{reseller_id} = $c->user->reseller_id;
             }
             delete $form->values->{reseller};
-            $c->model('DB')->txn_do(sub {
-                $c->stash->{tmpl}->update($form->values);
 
+            my $schema = $c->model('DB');
+            $schema->txn_do(sub {
+                my $tmpl = $c->stash->{tmpl_rs}->create($form->values);
             });
+
             delete $c->session->{created_objects}->{reseller};
             NGCP::Panel::Utils::Message::info(
                 c    => $c,
-                desc => $c->loc('Email template successfully updated'),
+                desc => $c->loc('Email template successfully created'),
             );
         } catch($e) {
             NGCP::Panel::Utils::Message::error(
                 c     => $c,
                 error => $e,
-                desc  => $c->loc('Failed to update email template'),
+                desc  => $c->loc('Failed to create email template'),
             );
-        };
+        }
         NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/emailtemplate'));
     }
-
-    $c->stash(
-        form => $form,
-        edit_flag => 1,
-    );
 }
 
-
 sub send_test :Chained('tmpl_list') :PathPart('test') :Args(0) {
     my ($self, $c) = @_;
 
diff --git a/share/templates/emailtemplate/list.tt b/share/templates/emailtemplate/list.tt
index af4e3adf24..b96a7974a4 100644
--- a/share/templates/emailtemplate/list.tt
+++ b/share/templates/emailtemplate/list.tt
@@ -1,4 +1,31 @@
 [% site_config.title = c.loc('Email Templates') -%]
+
+<div class="ngcp-separator"></div>
+<div class="row">
+    <span class="pull-left" style="margin:0 5px 0 5px;">
+        <a class="btn btn-primary btn-large" href="[% c.uri_for('/back') %]"><i class="icon-arrow-left"></i> [% c.loc('Back') %]</a>
+    </span>
+    [% UNLESS c.user.read_only -%]
+    <span>
+    <a class="btn btn-primary btn-large" href="[% c.uri_for('/emailtemplate/create') %]"><i class="icon-star"></i> [% c.loc('Create Email Template') %]</a>
+    </span>
+    [% END -%]
+</div>
+[% back_created = 1 -%]
+
+<div class="ngcp-separator"></div>
+<select onChange="changeEmailTemplatelist(this.value);" id="email_template_table_external_filter">
+<option value="[% c.uri_for_action('/emailtemplate/tmpl_ajax') -%]" >Show all templates</option>
+<option value="[% c.uri_for_action('/emailtemplate/tmpl_ajax_default') -%]" [%IF email_template_external_filter == 'default'%]selected[%END%] >Show default templates</option>
+</select>
+<script>
+function changeEmailTemplatelist(uri) {
+    $('#email_template_table').dataTable().fnSettings().sAjaxSource = uri;
+    $('#email_template_table').dataTable().api().ajax.reload();
+}
+</script>
+<div class="ngcp-separator"></div>
+
 [%
     helper.name = c.loc('Email Template');
     helper.identifier = 'email_template';
@@ -14,14 +41,21 @@
 
     UNLESS c.user.read_only;
         helper.dt_buttons = [
-            { name = c.loc('Edit'), uri = "/emailtemplate/'+full.id+'/edit", class = 'btn-small btn-primary', icon = 'icon-edit' },
-            { name = c.loc('Delete'), uri = "/emailtemplate/'+full.id+'/delete", class = 'btn-small btn-secondary', icon = 'icon-trash' },
-        ];
-        helper.top_buttons = [
-            { name = c.loc('Create Email Template'), uri = c.uri_for('/emailtemplate/create'), icon = 'icon-star' },
+            { name = c.loc('Edit'), uri = "/emailtemplate/'+full.id+'/edit", class = 'btn-small btn-primary', icon = 'icon-edit', condition = '!full.undeletable' },
+            { name = c.loc('Copy'), uri = "/emailtemplate/copy/'+full.id+'", class = 'btn-small btn-primary', icon = 'icon-edit' },
+            { name = c.loc('Delete'), uri = "/emailtemplate/'+full.id+'/delete", class = 'btn-small btn-secondary', icon = 'icon-trash', condition = '!full.undeletable' },
+
         ];
     END;
 
     PROCESS 'helpers/datatables.tt';
 -%]
+[%IF email_template_external_filter == 'default'%]
+<script>
+$( document ).ready(function() {
+changeEmailTemplatelist($('#email_template_table_external_filter').val());
+});
+</script>
+[%END%]
+
 [% # vim: set tabstop=4 syntax=html expandtab: -%]