diff --git a/e107_plugins/newsletter/languages/English.php b/e107_plugins/newsletter/languages/English.php
index 35475a09a..ca1942115 100644
--- a/e107_plugins/newsletter/languages/English.php
+++ b/e107_plugins/newsletter/languages/English.php
@@ -2,24 +2,19 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * Plugin - newsfeeds
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/languages/English.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * Plugin - newsletter
  *
 */
 
 define("NLLAN_MENU_CAPTION", "Newsletter");
 
-define("NLLAN_48", "You are subscribed from this newsletter - if you wish to unsubscribe please click the button below.");
-define("NLLAN_49", "Are you sure you want to un-subscribe from this newsletter?");
-define("NLLAN_50", "Click button to subscribe ( your subscription address is");
+define("NLLAN_48", "You are subscribed to this newsletter - if you wish to unsubscribe please click the button below.");
+define("NLLAN_49", "Are you sure you want to unsubscribe from this newsletter?");
+define("NLLAN_50", "Click button to subscribe (your subscription address is");
 define("NLLAN_51", "Unsubscribe");
 define("NLLAN_52", "Subscribe");
 define("NLLAN_53", "Are you sure you want to subscribe to this newsletter?");
@@ -28,7 +23,7 @@ define("NLLAN_67", "Archive overview");
 define("NLLAN_68", "Invalid parameter defined");
 define("NLLAN_69", "No sent newsletters available.");
 define("NLLAN_70", "Selected newsletter does not exist");
-define("NLLAN_71", "Back"); //TODO User Generic LAN
+//define("NLLAN_71", "Back"); 
 define("NLLAN_72", "View archive");
 
 ?>
diff --git a/e107_plugins/newsletter/newsletter_menu.php b/e107_plugins/newsletter/newsletter_menu.php
index e88f9b337..9cc57b11b 100644
--- a/e107_plugins/newsletter/newsletter_menu.php
+++ b/e107_plugins/newsletter/newsletter_menu.php
@@ -2,41 +2,29 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2013 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * Newsletter plugin - newsletter selection menu
  *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/newsletter_menu.php,v $
- * $Revision$
- * $Date$
- * $Author$
- *
 */
 
-/**
- *	e107 Newsletter plugin
- *
- *	@package	e107_plugins
- *	@subpackage	newsletter
- *	@version 	$Id$;
- */
-
 if (!defined('e107_INIT')) { exit; }
 if (!e107::isInstalled('newsletter'))
 {
 	return;
 }
 
-if(!USER || !$sql -> db_Select('newsletter', '*', "newsletter_parent='0'"))
-{	// no newsletters defined yet
+// Do not display menu when there are no newsletters defined yet
+if(!USER || !$sql->select('newsletter', '*', "newsletter_parent='0'"))
+{	
 	return FALSE;
 }
 
-$newsletterArray = $sql -> db_getList();
+$newsletterArray = $sql->db_getList();
 $requery = false;
-include_lan(e_PLUGIN.'newsletter/languages/'.e_LANGUAGE.'.php');
+//include_lan(e_PLUGIN.'newsletter/languages/'.e_LANGUAGE.'.php');
 
 foreach($_POST as $key => $value)
 {
@@ -44,36 +32,41 @@ foreach($_POST as $key => $value)
 	{
 		$subid = str_replace('nlUnsubscribe_', '', $key);
 		$newsletterArray[$subid]['newsletter_subscribers'] = str_replace(chr(1).USERID, "", $newsletterArray[$subid]['newsletter_subscribers']);
-		$sql -> db_Update('newsletter', "newsletter_subscribers='".$newsletterArray[$subid]['newsletter_subscribers']."' WHERE newsletter_id='".intval($subid)."' ");
+		$sql->update('newsletter', "newsletter_subscribers='".$newsletterArray[$subid]['newsletter_subscribers']."' WHERE newsletter_id='".intval($subid)."' ");
 		$requery = true;
 	}
-	else if(strpos($key, 'nlSubscribe_') === 0)
+	elseif(strpos($key, 'nlSubscribe_') === 0)
 	{
 		$subid = str_replace("nlSubscribe_", "", $key);
 		$nl_subscriber_array = $newsletterArray[$subid]['newsletter_subscribers'];
+
+		// prevent double entry of same user id
 		if (!array_key_exists(USERID, $nl_subscriber_array))
-		{	// prevent double entry of same user id
+		{	
 			$newsletterArray[$subid]['newsletter_subscribers'] .= chr(1).USERID;
 			$subscribers_list = array_flip(explode(chr(1), $newsletterArray[$subid]['newsletter_subscribers']));
 			sort($subscribers_list);
 			$new_subscriber_list = implode(chr(1), array_keys($subscribers_list));
+			
+			// remove the possible zero caused by function array_flip
 			if (substr($new_subscriber_list, 0, 1) == '0')
-			{	// remove the possible zero caused by function array_flip
+			{	
 				$new_subscriber_list = substr($new_subscriber_list, 1);
 			}
-			$sql -> db_Update('newsletter', "newsletter_subscribers='".$new_subscriber_list."' WHERE newsletter_id='".intval($subid)."' ");
+			
+			$sql->update('newsletter', "newsletter_subscribers='".$new_subscriber_list."' WHERE newsletter_id='".intval($subid)."' ");
 			$requery = true;
 		}
 	}
 }
 
-global $tp;
+//global $tp;
 
 if($requery)
 {
-	if($sql -> db_Select('newsletter', '*', "newsletter_parent='0' "))
+	if($sql->select('newsletter', '*', "newsletter_parent='0' "))
 	{
-		$newsletterArray = $sql -> db_getList();
+		$newsletterArray = $sql->db_getList();
 	}
 }	
 
@@ -83,9 +76,9 @@ foreach($newsletterArray as $nl)
 	$text .= "<div style='text-align: center; margin-left: auto; margin-right: auto;'>
 	<form method='post' action='".e_SELF."'>
 	<b>".
-	$tp -> toHTML($nl['newsletter_title'], TRUE)."</b><br />
+	$tp->toHTML($nl['newsletter_title'], TRUE)."</b><br />
 	<span class='smalltext'>".
-	$tp -> toHTML($nl['newsletter_text'], TRUE)."</span><br /><br />
+	$tp->toHTML($nl['newsletter_text'], TRUE)."</span><br /><br />
 	";
 
 	if(preg_match("#".chr(1).USERID."(".chr(1)."|$)#si", $nl['newsletter_subscribers']))
@@ -96,13 +89,14 @@ foreach($newsletterArray as $nl)
 	}
 	else
 	{
-		$text .= NLLAN_50." <b>".USEREMAIL."</b> )<br /><br />
+		$text .= NLLAN_50." <b>".USEREMAIL."</b>)<br /><br />
 		<input class='btn btn-default button' type='submit' name='nlSubscribe_".$nl['newsletter_id']."' value='".NLLAN_52."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_53)."') \" />
 		";
 	}
-	$nl_count = $sql -> db_Count('newsletter', "(*)", "WHERE newsletter_parent='".$nl['newsletter_id']."' AND newsletter_flag='1'");
+	$nl_count = $sql->count('newsletter', "(*)", "WHERE newsletter_parent='".$nl['newsletter_id']."' AND newsletter_flag='1'");
+	// display issued newsletters
 	if($nl_count > 0 && USER)
-	{	// display issued newsletters
+	{	
 		$text .= "<br /><a href='".e_PLUGIN_ABS."newsletter/nl_archive.php?show.".$nl['newsletter_id']."' alt='".NLLAN_72."' title='".NLLAN_72."'>".NLLAN_72."</a><br/><br/>";
 	}
 	$text .= "</form>
@@ -111,5 +105,5 @@ foreach($newsletterArray as $nl)
 	";
 }
 
-$ns -> tablerender(NLLAN_MENU_CAPTION, $text);
+$ns->tablerender(NLLAN_MENU_CAPTION, $text);
 ?>
\ No newline at end of file
diff --git a/e107_plugins/newsletter/nl_archive.php b/e107_plugins/newsletter/nl_archive.php
index a4d40aacb..e09cdd548 100644
--- a/e107_plugins/newsletter/nl_archive.php
+++ b/e107_plugins/newsletter/nl_archive.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2013 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -10,15 +10,6 @@
  *
 */
 
-
-/**
- *	e107 Newsletter plugin
- *
- *	@package	e107_plugins
- *	@subpackage	newsletter
- */
-
-
 require_once('../../class2.php');
 if (!e107::isInstalled('newsletter') || !ADMIN)
 {