diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..5ee2401
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,43 @@
+# Changelog
+
+All notable changes to Send WP Mail plugin.
+
+## 1.1
+
+### Fork
+- Fork wp.org repository plugin [send-admin-from-email](https://plugins.svn.wordpress.org/send-email-from-admin/).
+- Rebrand plugin "Send WP Mail".
+- Rename main plugin file `send-wp-mail.php`.
+
+### Fixed
+- Disable email spoofing in original plugin.
+ - Use WordPress core `wp_from_mail` and `wp_from_mail_name` hooks to change from email details.
+ - From field is for display purposes only.
+ - Do not send from details in headers.
+ - Do not use admin user's email.
+
+## [1.0](https://plugins.svn.wordpress.org/send-email-from-admin/tags/1.0/)
+- Fix typos.
+
+## [0.9.3](https://plugins.svn.wordpress.org/send-email-from-admin/tags/0.9.3/)
+- Add links.
+- Minor css changes.
+
+## [0.9.2](https://plugins.svn.wordpress.org/send-email-from-admin/tags/0.9.2/)
+- Minor code cleanup
+- Add HTML5 'required' attribute to form fields.
+- Only load js and css on admin page.
+
+## [0.9.1](https://plugins.svn.wordpress.org/send-email-from-admin/tags/0.9.1/)
+- Cleanup css and html.
+- Add mail dashicon to title.
+- Uploaded file (attachment) is now deleted from server after email is sent.
+
+## [0.9](https://plugins.svn.wordpress.org/send-email-from-admin/tags/0.9/)
+### Initial release
+- Send email from admin page.
+- Send email to multiple recipients.
+- Send individual emails to multiple recipients.
+- Add images from the WordPress Media Library.
+- Upload and attach one attachment to the email message.
+- Select recipients from registered users' email addresses.
diff --git a/css/sefa.css b/css/send-wp-mail.css
similarity index 54%
rename from css/sefa.css
rename to css/send-wp-mail.css
index 618ec88..64e727b 100644
--- a/css/sefa.css
+++ b/css/send-wp-mail.css
@@ -1,89 +1,89 @@
-#sefa-wrapper h1 {
- font-size: 2.8em;
- font-weight: 200;
- margin-bottom: 26px;
- margin-left: -4px;
-}
-#sefa-wrapper h1:before {
- font-family: "dashicons";
- content: "\f465";
- top: 8px;
- position: relative;
- margin-right: 10px;
- font-size: 1.2em;
-}
-#sefa-wrapper div.error ul li {
- list-style: initial;
- margin-left: 20px;
- margin-bottom: 0;
-}
-#sefa-wrapper div.updated {
- padding: 10px;
- margin-bottom: 5px;
-}
-#sefa-form .form-table {
- margin-top: 0;
-}
-#sefa-form .form-table tr:first-child th {
- padding-top: 5px;
-}
-#sefa-form .form-table tr:first-child td {
- padding-top: 0;
-}
-#sefa-form .form-table th {
- width: auto;
- min-width: 100px;
-}
-#sefa-form .form-table td {
- vertical-align: text-top;
-}
-#sefa-form .form-table tr:last-child td {
- padding: 0 10px;
-}
-#sefa-form input[type=text],
-#sefa-form input[type=email],
-#sefa-form textarea,
-#sefa-form .wp-editor-wrap {
- width: 100%;
- padding: 6px 10px
-}
-#sefa-form .sefa-radio-wrap {
- display: inline;
-}
-#sefa-form .wp-editor-wrap {
- padding-left: 0;
-}
-#sefa-form #sefa-user-list {
- margin-top: 7px;
-}
-#sefa-form .note {
- font-size: 12px;
- color: #888;
- padding: 5px 0 0 1px;
-}
-
-@media screen and (max-width: 1300px) {
- #sefa-wrapper {
- width: 100%;
- margin-left: 0;
- }
-}
-@media screen and (max-width: 900px) {
- #sefa-form .sefa-radio-wrap {
- display: block;
- }
-}
-@media screen and (max-width: 850px) {
- #sefa-wrapper .postbox {
- margin-right: 10px;
- }
-}
-@media screen and (max-width: 500px) {
- #sefa-wrapper h1 {
- font-size: 2em;
- margin-left: 0;
- }
- #sefa-wrapper h1:before {
- top: 6px;
- }
+#swpm-wrapper h1 {
+ font-size: 2.8em;
+ font-weight: 200;
+ margin-bottom: 26px;
+ margin-left: -4px;
+}
+#swpm-wrapper h1:before {
+ font-family: "dashicons";
+ content: "\f465";
+ top: 8px;
+ position: relative;
+ margin-right: 10px;
+ font-size: 1.2em;
+}
+#swpm-wrapper div.error ul li {
+ list-style: initial;
+ margin-left: 20px;
+ margin-bottom: 0;
+}
+#swpm-wrapper div.updated {
+ padding: 10px;
+ margin-bottom: 5px;
+}
+#swpm-form .form-table {
+ margin-top: 0;
+}
+#swpm-form .form-table tr:first-child th {
+ padding-top: 5px;
+}
+#swpm-form .form-table tr:first-child td {
+ padding-top: 0;
+}
+#swpm-form .form-table th {
+ width: auto;
+ min-width: 100px;
+}
+#swpm-form .form-table td {
+ vertical-align: text-top;
+}
+#swpm-form .form-table tr:last-child td {
+ padding: 0 10px;
+}
+#swpm-form input[type=text],
+#swpm-form input[type=email],
+#swpm-form textarea,
+#swpm-form .wp-editor-wrap {
+ width: 100%;
+ padding: 6px 10px
+}
+#swpm-form .swpm-radio-wrap {
+ margin-bottom: 5px;
+}
+#swpm-form .wp-editor-wrap {
+ padding-left: 0;
+}
+#swpm-form #swpm-user-list {
+ margin-top: 7px;
+}
+#swpm-form .note {
+ font-size: 12px;
+ color: #888;
+ padding: 5px 0 0 1px;
+}
+
+@media screen and (max-width: 1300px) {
+ #swpm-wrapper {
+ width: 100%;
+ margin-left: 0;
+ }
+}
+@media screen and (max-width: 900px) {
+ #swpm-form .swpm-radio-wrap {
+ display: block;
+ }
+}
+@media screen and (max-width: 850px) {
+ #swpm-wrapper .postbox {
+ margin-right: 10px;
+ }
+}
+@media screen and (max-width: 500px) {
+ #swpm-wrapper h1 {
+ font-size: 2em;
+ margin-left: 0;
+ }
+ #swpm-wrapper h1:before {
+ top: 6px;
+ }
}
\ No newline at end of file
diff --git a/js/sefa.js b/js/send-wp-mail.js
similarity index 70%
rename from js/sefa.js
rename to js/send-wp-mail.js
index e585bf2..da3ad88 100644
--- a/js/sefa.js
+++ b/js/send-wp-mail.js
@@ -1,6 +1,6 @@
-jQuery( document ).ready( function( $ ) {
- $("#sefa-user-list").change( function() {
- $recipients = $("#sefa-recipient-emails");
+jQuery( function( $ ) {
+ $("#swpm-user-list").on( 'change', function() {
+ $recipients = $("#swpm-recipient-emails");
if ( $recipients.val() == '' ) {
$recipients.val( $(this).find("option:selected").attr("value") );
} else if ( $(this).val() != '' ) {
diff --git a/languages/sefa-fr_FR.mo b/languages/sefa-fr_FR.mo
deleted file mode 100644
index 88c32ce..0000000
Binary files a/languages/sefa-fr_FR.mo and /dev/null differ
diff --git a/languages/sefa-fr_FR.po b/languages/sefa-fr_FR.po
deleted file mode 100644
index ada10c5..0000000
--- a/languages/sefa-fr_FR.po
+++ /dev/null
@@ -1,74 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Simple Email From Admin\n"
-"POT-Creation-Date: 2015-10-28 13:05-0330\n"
-"PO-Revision-Date: 2015-10-28 13:05-0330\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
-"X-Poedit-KeywordsList: __;_e;_;gettext;gettext_noop\n"
-"X-Poedit-Basepath: ../\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: simple-email-from-admin.php:73
-msgid "Please enter an email recipient in the To: field."
-msgstr "S'il vous plaît entrer une adresse e-mail dans le champ A:."
-
-#: simple-email-from-admin.php:87
-msgid "Please enter a Subject."
-msgstr "S'il vous plaît entrer un sujet."
-
-#: simple-email-from-admin.php:88
-msgid "Please enter a Message."
-msgstr "S'il vous plaît entrer un message."
-
-#: simple-email-from-admin.php:98
-msgid "Your email has been successfully sent!"
-msgstr "Votre e-mail a été envoyé avec succès!"
-
-#: simple-email-from-admin.php:100
-msgid "There was an error sending the email."
-msgstr "Il y avait une erreur d'envoi du courriel."
-
-#: simple-email-from-admin.php:105
-msgid "Your email has been successfully sent to "
-msgstr "Votre courriel a été envoyé avec succès à "
-
-#: simple-email-from-admin.php:107
-msgid "There was an error sending the email to "
-msgstr "Il y avait une erreur d'envoi de l'e-mail "
-
-#: simple-email-from-admin.php:115
-msgid "Send Email From Admin"
-msgstr ""
-
-#: simple-email-from-admin.php:138
-msgid "These can be changed in Settings->General."
-msgstr "Ceux-ci peuvent être modifiés en Settings->General."
-
-#: simple-email-from-admin.php:142
-msgid ""
-"To send to multiple recipeints, enter each email address seperated by a "
-"comma or choose from the user list below."
-msgstr ""
-"Pour envoyer à plusieurs destinataires, entrez chaque adresse mail séparée "
-"par une virgule ou choisir parmi la liste des utilisateurs ci-dessous."
-
-#: simple-email-from-admin.php:144
-msgid "user list"
-msgstr "la liste des utilisateurs"
-
-#: simple-email-from-admin.php:163
-msgid "Send each recipient an individual email"
-msgstr "Envoyer un e-mail chaque destinataire individuel"
-
-#: simple-email-from-admin.php:166
-msgid "Send a group email to all recipients"
-msgstr "Envoyer un e-mail de groupe à tous les destinataires"
-
-#: simple-email-from-admin.php:188
-msgid "Send Message"
-msgstr "Envoyer le message"
diff --git a/languages/sefa.pot b/languages/sefa.pot
deleted file mode 100644
index cb3456e..0000000
--- a/languages/sefa.pot
+++ /dev/null
@@ -1,72 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Simple Email From Admin\n"
-"POT-Creation-Date: 2015-10-28 13:01-0330\n"
-"PO-Revision-Date: 2015-10-28 13:01-0330\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
-"X-Poedit-KeywordsList: __;_e;_;gettext;gettext_noop\n"
-"X-Poedit-Basepath: ../\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: simple-email-from-admin.php:73
-msgid "Please enter an email recipient in the To: field."
-msgstr ""
-
-#: simple-email-from-admin.php:87
-msgid "Please enter a Subject."
-msgstr ""
-
-#: simple-email-from-admin.php:88
-msgid "Please enter a Message."
-msgstr ""
-
-#: simple-email-from-admin.php:98
-msgid "Your email has been successfully sent!"
-msgstr ""
-
-#: simple-email-from-admin.php:100
-msgid "There was an error sending the email."
-msgstr ""
-
-#: simple-email-from-admin.php:105
-msgid "Your email has been successfully sent to "
-msgstr ""
-
-#: simple-email-from-admin.php:107
-msgid "There was an error sending the email to "
-msgstr ""
-
-#: simple-email-from-admin.php:115
-msgid "Send Email From Admin"
-msgstr ""
-
-#: simple-email-from-admin.php:138
-msgid "These can be changed in Settings->General."
-msgstr ""
-
-#: simple-email-from-admin.php:142
-msgid ""
-"To send to multiple recipeints, enter each email address seperated by a "
-"comma or choose from the user list below."
-msgstr ""
-
-#: simple-email-from-admin.php:144
-msgid "user list"
-msgstr ""
-
-#: simple-email-from-admin.php:163
-msgid "Send each recipient an individual email"
-msgstr ""
-
-#: simple-email-from-admin.php:166
-msgid "Send a group email to all recipients"
-msgstr ""
-
-#: simple-email-from-admin.php:188
-msgid "Send Message"
-msgstr ""
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index a80db0f..0000000
--- a/readme.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-=== Send Email From Admin ===
-Contributors: kojak711
-Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8HHLL6WRX9Z68
-Tags: email, send email, admin email, custom email, email tools, email attachment
-Requires at least: 4.0
-Tested up to: 6.2
-Stable tag: 1.0
-License: GPLv2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
-
-Easily send a simple custom email with an attachment from the WordPress administration screen.
-
-== Description ==
-
-Send Email From Admin gives you the ability to easily send a custom HTML email from the WordPress administration screen. You can send to existing users or add your own recipients. You can send to multiple recipients and choose to send group emails or individual emails. Emails can also have an attachment. A new menu item called 'Send Email' is added under the Tools menu. This plugin is also translatable.
-
-NOTE: This is not intended to be a mass/bulk mailing plugin. This is a very lean plugin that is best suited to send an email to one or up to a handful of recipients.
-
-== Installation ==
-
-1. Upload `send-email-from-admin` folder to the `/wp-content/plugins/` directory
-2. Activate the plugin through the 'Plugins' menu in WordPress
-
-== Frequently Asked Questions ==
-
-= Can I change the From name and From email address? =
-
-Yes. The plugin uses the values that you entered for Site Title and E-Mail Address in Settings->General.
-
-= Can I send to multiple recipients? =
-
-Yes. You have the option to send to multiple recipents and you can choose to send the email as an individual email to each recipient (each recipient will only see their own email address in the To: field) or as a group email (each recipient will see the other recipients in the To: field).
-
-= Can I add images to the email? =
-
-Yes. You can add images from the WordPress Media Library.
-
-= Can I add an attachment to the email? =
-
-Yes. You can upload and attach one attachment to the email message.
-
-== Screenshots ==
-
-1. Send Email From Admin main screen.
-
-== Changelog ==
-
-= 1.0 =
-* fix typos
-
-= 0.9.3 =
-* added links
-* minor css changes
-
-= 0.9.2 =
-* minor code cleanup
-* added HTML5 'required' attribute to form fields
-* js and css now only load on SEFA admin page
-
-= 0.9.1 =
-* css and html cleanup
-* added mail dashicon
-* uploaded file (attachment) is now deleted from server after email is sent
-
-= 0.9 =
-* Initial release
\ No newline at end of file
diff --git a/send-email-from-admin.php b/send-email-from-admin.php
deleted file mode 100644
index 6bcd3ce..0000000
--- a/send-email-from-admin.php
+++ /dev/null
@@ -1,268 +0,0 @@
- Send Email.
-Version: 1.0
-Author: kojak711
-Domain Path: /languages
-Text Domain: sefa
-
-Send Email From Admin is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Send Email From Admin is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Send Email From Admin. If not, see