diff --git a/lib/WebGUI/Mailing/Admin.pm b/lib/WebGUI/Mailing/Admin.pm
index 3f15e62..a05fe03 100644
--- a/lib/WebGUI/Mailing/Admin.pm
+++ b/lib/WebGUI/Mailing/Admin.pm
@@ -91,12 +91,19 @@ sub www_settings {
     $f->text(
         name    => 'newsletterReturnDomain',
         value   => $setting->get( 'newsletterReturnDomain' ),
-        label   => $i18n->get( 'Newsletter domain name' ),
+        label   => $i18n->get( 'newsletter domain name' ),
     );
     $f->integer(
         name    => 'newsletterBounceScoreThreshold',
         value   => $setting->get( 'newsletterBounceScoreThreshold' ),
-        label   => $i18n->get( 'Bounce score threshold' ),
+        label   => $i18n->get( 'bounce score threshold' ),
+    );
+    $f->template(
+        name            => 'mailingManagerTemplateId',
+        value           => $setting->get( 'mailingManagerTemplateId' ),
+        defaultValue    => 'FTfNhWI8KJOwLzFUl5rYeQ',
+        label           => $i18n->get( 'manage mailings template' ),
+        namespace       => 'Mailing/Manage',
     );
     $f->submit;
 
@@ -111,8 +118,9 @@ sub www_settingsSave {
 
     my ($setting, $form) = $session->quick( 'setting', 'form' );
 
-    $setting->set( 'newsletterReturnDomain', $form->get('newsletterReturnDomain') );
-    $setting->set( 'newsletterBounceScoreThreshold', $form->integer('newsletterBounceScoreThreshold') );
+    $setting->set( 'newsletterReturnDomain',            $form->get('newsletterReturnDomain')                );
+    $setting->set( 'newsletterBounceScoreThreshold',    $form->integer('newsletterBounceScoreThreshold')    );
+    $setting->set( 'mailingManagerTemplateId',          $form->template('mailingManagerTemplateId')         );
 
     return $self->www_settings;
 }
@@ -122,6 +130,7 @@ sub www_view {
     my $self    = shift;
     my $session = $self->session;
     my $url     = $session->url;
+    my $setting = $session->setting;
     my $i18n    = WebGUI::International->new( $session, 'MailingManager' );
 
     return $self->www_settings unless $self->configurationComplete;
@@ -162,7 +171,7 @@ sub www_view {
 
     my $var = { newsletter_loop => \@newsletterLoop };
 
-    my $template = WebGUI::Asset::Template->new( $self->session, 'FTfNhWI8KJOwLzFUl5rYeQ' );
+    my $template = WebGUI::Asset::Template->new( $session, $setting->get('mailingManagerTemplateId') );
     return $self->getAdminConsole->render( $template->process( $var ), $i18n->get( 'manage mailings' ) );
 }
 
diff --git a/lib/WebGUI/i18n/Dutch/MailingManager.pm b/lib/WebGUI/i18n/Dutch/MailingManager.pm
index 005fb5c..582dff7 100644
--- a/lib/WebGUI/i18n/Dutch/MailingManager.pm
+++ b/lib/WebGUI/i18n/Dutch/MailingManager.pm
@@ -82,6 +82,11 @@ our $I18N = {
     'cancel mailing failure' => {
         message => 'De mailing kan niet afgebroken worden. Dit kan voorkomen als de mailing geplanned stond om verzonden te worden vlak voor het moment waarop deze afgebroken werd.',
     },
+
+    'manage mailings template' => {
+        message => 'Mailing beheer sjabloon',
+    },
+
 };
 
 1;
diff --git a/lib/WebGUI/i18n/English/MailingManager.pm b/lib/WebGUI/i18n/English/MailingManager.pm
index 18fb565..fee900d 100644
--- a/lib/WebGUI/i18n/English/MailingManager.pm
+++ b/lib/WebGUI/i18n/English/MailingManager.pm
@@ -82,6 +82,11 @@ our $I18N = {
     'cancel mailing failure' => {
         message => 'The mailing could not be canceled. This can happen when the mailing has been scheduled just before it was canceled.',
     },
+
+    'manage mailings template' => {
+        message => 'Manage mailings template',
+    },
+
 };
 
 1;
diff --git a/sbin/install_newsletter.pl b/sbin/install_newsletter.pl
index 896a920..b7f8bf4 100644
--- a/sbin/install_newsletter.pl
+++ b/sbin/install_newsletter.pl
@@ -30,6 +30,7 @@ installNewsletterSettings( $session );
 addPluginsToConfigFile( $session );
 addTemplateColumnToNewsletterCollection( $session );
 addRecentColumnToNewsletterCollection( $session );
+renamespaceTemplates( $session );
 
 finish($session);
 
@@ -185,8 +186,14 @@ sub installNewsletterSettings {
     
     print "\tInstalling newsletter setting slots...";
 
-    $setting->add( 'newsletterReturnDomain', undef  ) unless $setting->has( 'newsletterReturnDomain'      );
-    $setting->add( 'newsletterBounceScoreThreshold', 0    ) unless $setting->has( 'newsletterBounceScoreThreshold'    );
+    $setting->add( 'newsletterReturnDomain', undef  )       
+        unless $setting->has( 'newsletterReturnDomain' );
+
+    $setting->add( 'newsletterBounceScoreThreshold', 0 ) 
+        unless $setting->has( 'newsletterBounceScoreThreshold' );
+
+    $setting->add( 'mailingManagerTemplateId', 'FTfNhWI8KJOwLzFUl5rYeQ' )       
+        unless $setting->has( 'mailingManagerTemplateId' );
 
     print "Done.\n";
 }
@@ -218,6 +225,21 @@ sub addPluginsToConfigFile {
     print "Done.\n";
 }
 
+#----------------------------------------------------------------------------
+sub renamespaceTemplates {
+    my $session = shift;
+    my $db      = $session->db;
+
+    print "\tRenamespacing templates...";
+
+    $db->write( 'update template set namespace=? where namespace=?', [
+        'Mailing/Manage',
+        'NLAdmin/Manage',
+    ] );
+
+    print "Done.\n";
+}
+
 #----------------------------------------------------------------------------
 sub start {
     my $webguiRoot  = shift;
diff --git a/sbin/packages/root_import_personalnewsletter.wgpkg b/sbin/packages/root_import_personalnewsletter.wgpkg
index 6ba7a9d..e7ddbd6 100644
Binary files a/sbin/packages/root_import_personalnewsletter.wgpkg and b/sbin/packages/root_import_personalnewsletter.wgpkg differ