diff --git a/README.md b/README.md
index 039913abeb..7eb74e0f38 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,44 @@
 <div align="center">
-  <a href="https://github.com/RainLoop/rainloop-webmail">
-    <img width="200" heigth="200" src="https://www.rainloop.net/static/img/logo-256x256-tiny.png">
+  <a href="https://github.com/the-djmaze/snappymail">
+    <img width="200" heigth="200" src="https://snappymail.eu/static/img/logo-256x256-tiny.png">
   </a>
   <br>
-  <h1>RainLoop Webmail</h1>
+  <h1>SnappyMail</h1>
   <br>
   <p>
     Simple, modern &amp; fast web-based email client.
   </p>
   <p>
-    Modest system requirements, decent performance, simple installation and upgrade, no database required
-    - all these make RainLoop Webmail a perfect choice for your email solution.
+    The drastically upgraded &amp; secured fork of <a href="https://github.com/RainLoop/rainloop-webmail">RainLoop Webmail Community edition</a>.
+  </p>
+  <p>
+    We thank RainLoop team for making a great PHP 5 product that was good in the past.
+  </p>
+  <p>
+    Up to date system requirements, snappy performance, simple installation and upgrade, no database required
+    - all these make SnappyMail a good choice.
   </p>
   <h2></h2>
   <br>
 </div>
 
-For more information about the product, check [rainloop.net](https://www.rainloop.net/).
+For more information about the product, check [snappymail.eu](https://snappymail.eu/).
 
-Information about installing the product, check the [wiki page](https://github.com/the-djmaze/rainloop-webmail/wiki/Installation-instructions).
+Information about installing the product, check the [wiki page](https://github.com/the-djmaze/snappymail/wiki/Installation-instructions).
 
-And don't forget to read the [official documentation](https://www.rainloop.net/docs/).
+And don't forget to read the [RainLoop documentation](https://www.rainloop.net/docs/).
 
 ## License
 
-**RainLoop Webmail (Community edition)** is released under
+**SnappyMail** is released under
 **GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
 http://www.gnu.org/licenses/agpl-3.0.html
 
-Copyright (c) 2019 Rainloop Team
+Copyright (c) 2020 SnappyMail
 
 ## Modifications
 
-This fork has the following changes:
+This fork of RainLoop has the following changes:
 
 * Privacy/GDPR friendly (no: Social, Gravatar, Facebook, Google, Twitter, DropBox, OwnCloud, X-Mailer)
 * Admin uses password_hash/password_verify
@@ -164,5 +170,5 @@ in the [labs] section add/edit: `use_ck_html_editor = On`
 
 ### PHP73 branch
 
-There's a branch with only the PHP 7.3 changes at
-https://github.com/the-djmaze/rainloop-webmail/tree/php73
+There's a RainLoop 1.14.0 branch with only the PHP 7.3 changes at
+https://github.com/the-djmaze/snappymail/tree/php73
diff --git a/dev/App/User.js b/dev/App/User.js
index 16f240bff5..1f7c719394 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -1038,7 +1038,7 @@ class AppUser extends AbstractApp {
 									navigator.registerProtocolHandler(
 										'mailto',
 										location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
-										'' + (Settings.get('Title') || 'RainLoop')
+										'' + (Settings.get('Title') || 'SnappyMail')
 									);
 								} catch (e) {} // eslint-disable-line no-empty
 
diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js
index f76ba0f878..4e678ac6a5 100644
--- a/dev/Settings/Admin/About.js
+++ b/dev/Settings/Admin/About.js
@@ -3,7 +3,6 @@ import ko from 'ko';
 class AboutAdminSettings {
 	constructor() {
 		this.version = ko.observable(rl.settings.app('version'));
-		this.coreType = ko.observable('djmaze');
 	}
 }
 
diff --git a/package.json b/package.json
index 8c33426cd0..79e2779488 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,18 @@
 {
-  "name": "rainloop",
-  "title": "RainLoop Webmail",
+  "name": "snappymail",
+  "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
   "version": "1.14.0-djmaze8",
-  "homepage": "https://www.rainloop.net",
+  "homepage": "https://snappymail.eu",
   "author": {
-    "name": "RainLoop Team",
-    "email": "support@rainloop.net",
-    "web": "https://www.rainloop.net"
+    "name": "DJ Maze",
+    "email": "support@snappymail.eu",
+    "web": "https://snappymail.eu"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/RainLoop/rainloop-webmail.git"
+    "url": "git://github.com/the-djmaze/snappymail.git"
   },
   "scripts": {
     "watch-css": "gulp watchCss",
@@ -23,14 +23,10 @@
     {
       "type": "AGPL 3.0",
       "ulr": "http://www.gnu.org/licenses/agpl-3.0.html"
-    },
-    {
-      "type": "RainLoop Software License",
-      "ulr": "https://www.rainloop.net/licensing/"
     }
   ],
   "bugs": {
-    "url": "https://github.com/RainLoop/rainloop-webmail/issues"
+    "url": "https://github.com/the-djmaze/snappymail/issues"
   },
   "keywords": [
     "webmail",
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 891aa12b8d..237d6ff1c6 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1174,8 +1174,8 @@ public function AppData(bool $bAdmin, bool $bMobile = false, bool $bMobileDevice
 			'Email' => '',
 			'DevEmail' => '',
 			'DevPassword' => '',
-			'Title' => $oConfig->Get('webmail', 'title', 'RainLoop Webmail'),
-			'LoadingDescription' => $oConfig->Get('webmail', 'loading_description', 'RainLoop'),
+			'Title' => $oConfig->Get('webmail', 'title', 'SnappyMail Webmail'),
+			'LoadingDescription' => $oConfig->Get('webmail', 'loading_description', 'SnappyMail'),
 			'FaviconUrl' => $oConfig->Get('webmail', 'favicon_url', ''),
 			'LoginDescription' => '',
 			'LoginLogo' => '',
@@ -2403,7 +2403,7 @@ public function DoAttachmentsActions() : array
 						{
 							$oZip = new \ZipArchive();
 							$oZip->open($sZipFileName, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE);
-							$oZip->setArchiveComment('RainLoop/'.APP_VERSION);
+							$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
 
 							foreach ($aData as $aItem)
 							{
@@ -3693,9 +3693,9 @@ private function buildMessage(Model\Account $oAccount, bool $bWithDraftInfo = tr
 
 		$oMessage = new \MailSo\Mime\Message();
 
-		if (!$this->Config()->Get('security', 'hide_x_mailer_header', false))
+		if (!$this->Config()->Get('security', 'hide_x_mailer_header', true))
 		{
-			$oMessage->SetXMailer('RainLoop/'.APP_VERSION);
+			$oMessage->SetXMailer('SnappyMail/'.APP_VERSION);
 		} else {
 			$oMessage->DoesNotAddDefaultXMailer();
 		}
@@ -3876,9 +3876,9 @@ private function buildReadReceiptMessage(Model\Account $oAccount) : \MailSo\Mime
 
 		$oMessage = new \MailSo\Mime\Message();
 
-		if (!$this->Config()->Get('security', 'hide_x_mailer_header', false))
+		if (!$this->Config()->Get('security', 'hide_x_mailer_header', true))
 		{
-			$oMessage->SetXMailer('RainLoop/'.APP_VERSION);
+			$oMessage->SetXMailer('SnappyMail/'.APP_VERSION);
 		}
 
 		$oMessage->SetFrom(new \MailSo\Mime\Email($oIdentity->Email(), $oIdentity->Name()));
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index 3ce4c688ac..5fbbbecf42 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -547,7 +547,7 @@ private function getRepositoryDataByUrl(string $sRepo, bool &$bReal = false) : a
 			$sContentType = '';
 
 			$sRepPath = $sRepo.$sRepoFile;
-			$sRep = '' !== $sRepo ? $oHttp->GetUrlAsString($sRepPath, 'RainLoop', $sContentType, $iCode, $this->Logger(), 10,
+			$sRep = '' !== $sRepo ? $oHttp->GetUrlAsString($sRepPath, 'SnappyMail', $sContentType, $iCode, $this->Logger(), 10,
 				$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', '')) : false;
 
 			if (false !== $sRep)
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index f830e80fdf..fd358be342 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -9,7 +9,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 	public function __construct()
 	{
 		parent::__construct('application.ini',
-			'; RainLoop Webmail configuration file
+			'; SnappyMail configuration file
 ; Please don\'t add custom parameters here, those will be overwritten',
 			defined('APP_ADDITIONAL_CONFIGURATION_NAME') ? APP_ADDITIONAL_CONFIGURATION_NAME : '');
 	}
@@ -110,8 +110,8 @@ protected function defaultValues() : array
 
 			'webmail' => array(
 
-				'title'							=> array('RainLoop Webmail', 'Text displayed as page title'),
-				'loading_description'			=> array('RainLoop', 'Text displayed on startup'),
+				'title'							=> array('SnappyMail Webmail', 'Text displayed as page title'),
+				'loading_description'			=> array('SnappyMail', 'Text displayed on startup'),
 				'favicon_url'					=> array('', ''),
 
 				'theme'							=> array('Default', 'Theme used by default'),
@@ -165,7 +165,7 @@ protected function defaultValues() : array
 				'csrf_protection'	=> array(true,
 					'Enable CSRF protection (http://en.wikipedia.org/wiki/Cross-site_request_forgery)'),
 
-				'custom_server_signature'	=> array('RainLoop'),
+				'custom_server_signature'	=> array('SnappyMail'),
 				'x_frame_options_header'	=> array('DENY'),
 				'x_xss_protection_header'	=> array('1; mode=block'),
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
index 1395e0765d..9f770d7af2 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
@@ -13,7 +13,7 @@ public function __construct(string $sPluginName, array $aMap = array())
 	{
 		$this->aMap = is_array($aMap) ? $this->convertConfigMap($aMap) : array();
 
-		parent::__construct('plugin-'.$sPluginName.'.ini', '; RainLoop Webmail plugin ('.$sPluginName.')');
+		parent::__construct('plugin-'.$sPluginName.'.ini', '; SnappyMail plugin ('.$sPluginName.')');
 	}
 
 	private function convertConfigMap(array $aMap) : array
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index 40f731a3c7..7836f13af5 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -461,7 +461,7 @@ private function collectionToFileString(array $aFilters) : string
 		$aCapa = array();
 		$aParts = array();
 
-		$aParts[] = '# This is RainLoop Webmail sieve script.';
+		$aParts[] = '# This is SnappyMail sieve script.';
 		$aParts[] = '# Please don\'t change anything here.';
 		$aParts[] = '# RAINLOOP:SIEVE';
 		$aParts[] = '';
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
index 0727b8686d..9493df7c24 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -111,7 +111,7 @@ private function localHandle() : self
 		{
 			$this->oHttp->StatusHeader(403);
 			echo $this->oServiceActions->ErrorTemplates('Access Denied.',
-				'Access to the RainLoop Webmail Admin Panel is not allowed!', true);
+				'Access to the SnappyMail Admin Panel is not allowed!', true);
 
 			return $this;
 		}
@@ -165,7 +165,7 @@ private function localHandle() : self
 			{
 				echo $this->oServiceActions->ErrorTemplates(
 					'Permission denied!',
-					'RainLoop Webmail cannot access to the data folder "'.APP_DATA_FOLDER_PATH.'"'
+					'SnappyMail cannot access to the data folder "'.APP_DATA_FOLDER_PATH.'"'
 				);
 
 				return $this;
@@ -245,7 +245,7 @@ private function indexTemplateParameters(bool $bAdmin = false, bool $bMobile = f
 		$sFaviconPngLink = $sFaviconUrl ? $sFaviconUrl : $this->staticPath('apple-touch-icon.png');
 		$sAppleTouchLink = $sFaviconUrl ? '' : $this->staticPath('apple-touch-icon.png');
 
-		$LoadingDescription = $oConfig->Get('webmail', 'loading_description', 'RainLoop');
+		$LoadingDescription = $oConfig->Get('webmail', 'loading_description', 'SnappyMail');
 
 		$aTemplateParameters = array(
 			'{{BaseAppHeadScriptLink}}' => '',
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index ea71ca0985..78d9e0349b 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -367,7 +367,7 @@ public function ServiceProxyExternal() : string
 			{
 				$iCode = 404;
 				$sContentType = '';
-				$mResult = $this->oHttp->GetUrlAsString($aData['Url'], 'RainLoop External Proxy', $sContentType, $iCode);
+				$mResult = $this->oHttp->GetUrlAsString($aData['Url'], 'SnappyMail External Proxy', $sContentType, $iCode);
 
 				if (false !== $mResult && 200 === $iCode &&
 					\in_array($sContentType, array('image/png', 'image/jpeg', 'image/jpg', 'image/bmp', 'image/gif')))
diff --git a/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
index 36683400f4..37d51d01f7 100644
--- a/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
@@ -315,7 +315,7 @@ public function request($method, $url = '', $body = null, $headers = array()) {
             // Return headers as part of the response
             CURLOPT_HEADER => true,
             CURLOPT_POSTFIELDS => $body,
-			CURLOPT_USERAGENT => 'RainLoop DAV Client', // TODO rainloop
+			CURLOPT_USERAGENT => 'SnappyMail DAV Client', // TODO rainloop
             // Automatically follow redirects
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_MAXREDIRS => 5,
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index 04a2d46761..91b9c18179 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -4,7 +4,7 @@
 			<h4 class="pull-left">
 				<i class="icon-spinner animated" style="margin-top: 2px" data-bind="style: {'visibility': adminManLoadingVisibility }"></i>
 				&nbsp;&nbsp;
-				RainLoop
+				SnappyMail
 				&mdash;
 				<span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span>
 			</h4>
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index c3d73d351e..87f64971ec 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -7,17 +7,13 @@
 				<div style="margin-left: 30px;">
 					2020 © <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
 					<br />
-					<a class="g-ui-link" href="https://www.rainloop.net/" target="_blank" style="padding-left: 0">https://rainloop.net/</a>
+					<a class="g-ui-link" href="https://snappymail.eu/" target="_blank" style="padding-left: 0">https://snappymail.eu/</a>
 				</div>
 			</div>
 			<div class="rl-desc" style="float: left">
-				<h1 style="margin-bottom: 0;">RainLoop</h1>
-				<h4 style="margin-top: 0;">
-					<span data-bind="text: version"></span>
-					<span data-bind="visible: 'stable' !== coreType()" style="padding-left: 3px; color: red; font-weight: normal">
-						(<span data-bind="text: coreType"></span> channel)
-					</span>
-				</h4>
+				<h1 style="margin-bottom: 0;">SnappyMail</h1>
+				<h4 style="margin-top: 0;" data-bind="text: version"></h4>
+				<h4 style="color: #aaa; font-weight: normal;">An advanced fork of <a href="https://www.rainloop.net/" target="_blank">RainLoop</a></h4>
 				<h4 style="color: #aaa; font-weight: normal;" data-i18n="TAB_ABOUT/LABEL_TAG_HINT"></h4>
 			</div>
 		</div>