diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php
index 777040b..c389768 100644
--- a/plugins/box/users/users.plugin.php
+++ b/plugins/box/users/users.plugin.php
@@ -140,14 +140,19 @@ class Users extends Frontend
                             Session::set('user_login', (string) $user['login']);
                             Session::set('user_role', (string) $user['role']);
 
-                            // Message
-                            $message = View::factory('box/users/views/frontend/registration_email')
+                            $mail = new PHPMailer();
+                            $mail->CharSet = 'utf-8';
+                            $mail->ContentType = 'text/html';
+                            $mail->SetFrom(Option::get('system_email'));
+                            $mail->AddReplyTo(Option::get('system_email'));
+                            $mail->AddAddress($user['email'], $user['login']);
+                            $mail->Subject = Option::get('sitename');
+                            $mail->MsgHTML(View::factory('box/users/views/emails/layout_email')
                                 ->assign('site_name', Option::get('sitename'))
                                 ->assign('user_login', $user['login'])
-                                ->render();
-
-                            // Send
-                            @mail($user['email'], Option::get('sitename'), $message);
+                                ->assign('view', 'new_user_email')
+                                ->render());
+                            $mail->Send();
 
                             // Redirect to user profile
                             Request::redirect(Option::get('siteurl').'users/'.Users::$users->lastId());
@@ -281,17 +286,23 @@ class Users extends Frontend
                     // Set new hash and new password
                     Users::$users->updateWhere("[login='" . $user['login'] . "']", array('hash' => Text::random('alnum', 12), 'password' => Security::encryptPassword($new_password)));
 
-                    // Message
-                    $message = View::factory('box/users/views/frontend/new_password_email')
+                    $mail = new PHPMailer();
+                    $mail->CharSet = 'utf-8';
+                    $mail->ContentType = 'text/html';
+                    $mail->SetFrom(Option::get('system_email'));
+                    $mail->AddReplyTo(Option::get('system_email'));
+                    $mail->AddAddress($user['email'], $user['login']);
+                    $mail->Subject = __('Your new password for :site_name', 'users', array(':site_name' => $site_name));
+                    $mail->MsgHTML(View::factory('box/users/views/emails/layout_email')
                         ->assign('site_url', $site_url)
                         ->assign('site_name', $site_name)
                         ->assign('user_id', $user['id'])
                         ->assign('user_login', $user['login'])
                         ->assign('new_password', $new_password)
-                        ->render();
+                        ->assign('view', 'new_password_email')
+                        ->render());
+                    $mail->Send();
 
-                    // Send
-                    @mail($user['email'], __('Your new password for :site_name', 'users', array(':site_name' => $site_name)), $message);
 
                     // Set notification
                     Notification::set('success', __('New password has been sent', 'users'));
@@ -325,17 +336,22 @@ class Users extends Frontend
                         // Update user hash
                         Users::$users->updateWhere("[login='" . $user_login . "']", array('hash' => $new_hash));
 
-                        // Message
-                        $message = View::factory('box/users/views/frontend/reset_password_email')
+                        $mail = new PHPMailer();
+                        $mail->CharSet = 'utf-8';
+                        $mail->ContentType = 'text/html';
+                        $mail->SetFrom(Option::get('system_email'));
+                        $mail->AddReplyTo(Option::get('system_email'));
+                        $mail->AddAddress($user['email'], $user['login']);
+                        $mail->Subject = __('Your login details for :site_name', 'users', array(':site_name' => $site_name));
+                        $mail->MsgHTML(View::factory('box/users/views/emails/layout_email')
                             ->assign('site_url', $site_url)
                             ->assign('site_name', $site_name)
                             ->assign('user_id', $user['id'])
                             ->assign('user_login', $user['login'])
                             ->assign('new_hash', $new_hash)
-                            ->render();
-
-                        // Send
-                        @mail($user['email'], __('Your login details for :site_name', 'users', array(':site_name' => $site_name)), $message);
+                            ->assign('view', 'reset_password_email')
+                            ->render());
+                        $mail->Send();
 
                         // Set notification
                         Notification::set('success', __('Your login details for :site_name has been sent', 'users', array(':site_name' => $site_name)));
diff --git a/plugins/box/users/views/emails/layout_email.view.php b/plugins/box/users/views/emails/layout_email.view.php
new file mode 100644
index 0000000..ac494d1
--- /dev/null
+++ b/plugins/box/users/views/emails/layout_email.view.php
@@ -0,0 +1,226 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
+    <title><?php echo Option::get('sitename'); ?></title>
+
+    <!-- Facebook sharing information tags -->
+    <meta property="og:title" content="<?php echo Option::get('sitename'); ?>" />
+
+    <style type="text/css">
+        /* EMBEDDED CSS
+           Android Mail doesn't support "class" declarations outside of a media query so use inline CSS as a rule.
+           More info: Http://www.emailonacid.com/blog/the_android_mail_app_and_css_class_declarations/ */
+
+
+        /****** EMAIL CLIENT BUG FIXES - BEST NOT TO CHANGE THESE ********/
+
+
+        /* Forces Hotmail to display emails at full width. */
+        .ExternalClass {width:100%;}
+
+        /* Forces Hotmail to display normal line spacing. */
+        .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height:100%;}
+
+        /* Prevents Webkit and Windows Mobile platforms from changing default font sizes. */
+        body {-webkit-text-size-adjust:none; -ms-text-size-adjust:none;}
+
+        /* Resets all body margins and padding to "0" for good measure. */
+        body {margin:0; padding:0;}
+
+        /* Resolves webkit padding issue. */
+        table {border-spacing:0;}
+
+        /* Resolves the Outlook 2007, 2010, and Gmail td padding issue. */
+        table td {border-collapse:collapse;}
+
+
+        /****** END BUG FIXES ********/
+
+
+        /****** RESETTING DEFAULTS, IT IS BEST TO OVERWRITE THESE STYLES INLINE ********/
+
+
+        /* This sets a clean slate for all clients EXCEPT Gmail.
+           From there it forces you to do all of your spacing inline during the development process.
+           Be sure to stick to margins because paragraph padding is not supported by Outlook 2007/2010.
+           Remember: Hotmail does not support "margin" nor the "margin-top" properties.
+           Stick to "margin-bottom", "margin-left", "margin-right" in order to control spacing.
+           It also wise to set the inline top-margin to "0" for consistancy in Gmail for every inline instance
+           of a paragraph tag. */   
+        p {margin:0; padding:0; margin-bottom:0;}
+
+        /* This CSS will overwrite Hotmails default CSS and make your headings appear consistant with Gmail.
+           From there, you can override with inline CSS if needed. */
+        h1, h2, h3, h4, h5, h6 {color:#333333; line-height:100%;}
+
+
+        /****** END RESETTING DEFAULTS ********/
+
+
+        /****** EDITABLE STYLES - FOR YOUR TEMPLATE ********/
+
+
+        /* The "body" is defined here for Yahoo Beta because it does not support your body tag. Instead, it will
+           create a wrapper div around your email and that div will inherit your embedded body styles.
+           The "#body_style" is defined for AOL because it does not support your embedded body definition nor
+           your body tag, we will use this class in our wrapper div. */
+        body, #body_style {width:100% !important; color:#333333; background:#FBFBFB; font-family:Arial,Helvetica,sans-serif; font-size:13px; line-height:1.4;}
+
+        /* This is the embedded CSS link color for Gmail. This will overwrite Hotmail and Yahoo Beta's
+           embedded link colors and make it consistent with Gmail. Also use this rule on inline CSS. */
+        a         {color:#114eb1; text-decoration:none;}
+
+        /* There is no way to set these inline so you have the option of adding pseudo class definitions here.
+           They won't work for Gmail or older Lotus Notes but it's a nice addition for all other clients. */
+        a:link    {color:#114eb1; text-decoration:none;}
+        a:visited {color:#183082; text-decoration:none;}
+        a:focus   {color:#0066ff !important;}
+        a:hover   {color:#0066ff !important;}
+
+        /* A nice and clean way to target phone numbers you want clickable and avoid a mobile phone from
+           linking other numbers that look like, but are not phone numbers. Use these two blocks of code to
+           "unstyle" any numbers that may be linked. The second block gives you a class ".mobile_link" to apply
+           with a span tag to the numbers you would like linked and styled.
+           More info: http://www.campaignmonitor.com/blog/post/3571/using-phone-numbers-in-html-email/ */
+        a[href^="tel"], a[href^="sms"] {text-decoration:none; color:#333333; pointer-events:none; cursor:default;}
+        .mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {text-decoration:default; color:#6e5c4f !important; pointer-events:auto; cursor:default;}
+
+
+        /****** MEDIA QUERIES ********/
+        /* You must use attribute selectors in your media queries to prevent Yahoo from rendering these styles. 
+           We added a yahoo attribute in the body tag to complete this fix. 
+           More info: http://www.emailonacid.com/blog/details/C13/stop_yahoo_mail_from_rendering_your_media_queries */
+
+        /* Target mobile devices. */
+        /* @media only screen and (max-device-width: 639px) { */
+        @media only screen and (max-width: 639px) {
+
+            /* Hide elements at smaller screen sizes (!important needed to override inline CSS). */
+            body[yahoo] .hide {display:none !important;}
+
+            /* Adjust table widths at smaller screen sizes. */
+            body[yahoo] .table {width:320px !important;}
+            body[yahoo] .innertable {width:280px !important;}
+
+            /* Resize hero image at smaller screen sizes. */
+            body[yahoo] .heroimage {width:280px !important; height:100px !important;}
+
+            /* Resize page shadow at smaller screen sizes. */
+            body[yahoo] .shadow {width:280px !important; height:4px !important;}
+
+            /* Collapse footer columns. */
+            body[yahoo] .footer-left    {width:320px !important;}
+            body[yahoo] .footer-right {width:320px !important;}
+            body[yahoo] .footer-right img {float:left !important; margin:0 1em 0 0 !important;}
+
+        }
+
+        /* Target tablet devices. */
+        /* @media only screen and (min-device-width: 640px) and (max-device-width: 1024px) { */
+        @media only screen and (min-width: 640px) and (max-width: 1024px) {
+
+        }
+
+
+        /*** END EDITABLE STYLES ***/
+
+
+        /****** TEMPORARY - THESE SHOULD BE MOVED INLINE AT END OF YOUR DEVELOPMENT PROCESS ********/
+
+        h1 {font-size:26px; line-height:1.2; font-weight:normal; margin-top:0; margin-bottom:0;}
+
+        p {margin-top:0; margin-bottom:0;}
+
+        img {display:block; border:none; outline:none; text-decoration:none;}
+
+        /* Remove spacing around Outlook 07, 10 tables */
+        table {border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;}
+
+        /*** END TEMPORARY ***/
+    </style>
+
+
+</head>
+
+
+<body style="width:100% !important; color:#333333; background:#FBFBFB; font-family:Arial,Helvetica,sans-serif; font-size:13px; line-height:1.4;"
+alink="#9d470a" link="#9d470a" bgcolor="#FBFBFB" text="#333333" yahoo="fix">
+<!-- You may adjust each of the values above for your template as needed.
+
+We've included the style attribute for Gmail because it does not support embedded CSS and it will convert this body tag to
+a div. Since it gets converted to a div, the other body attributes like bgcolor are ignored.
+
+We included body attributes (alink, link, bgcolor and text) for Lotus Notes 6.5 and 7, as these clients do not offer much
+support for embedded nor inline CSS. 
+
+The "min-height" attribute is set for Gmail and AOL since they will be converting this body tag to a div and we want our
+background color to reach the bottom of the page. 
+
+The yahoo attribute is added if you are using media queries for mobile devices (see media queries above) -->
+
+<!-- PAGE WRAPPER -->
+    
+    <div id="body_style">
+
+        <!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
+        <table cellpadding="0" cellspacing="0" border="0" align="center" style="width:100% !important; margin:0; padding:0;">
+            <tr bgcolor="#FBFBFB">
+                <td style="padding-top:20px;">
+                    <!-- Tables are the most common way to format your email consistently. Set your table widths inside cells and in most cases reset cellpadding, cellspacing, and border to zero. Use nested tables as a way to space effectively in your message. -->
+                    <table width="600" cellpadding="0" cellspacing="0" border="0" align="center" class="table" style="border:1px solid #ccc;">
+
+                        <!-- CONTENT -->
+                        <!-- set a value for bgcolor -->
+                        <tr bgcolor="#ffffff">
+                            <td style="padding-top:20px;">
+
+                                <!-- article -->
+                                <table style="margin-bottom:1em;" width="560" cellpadding="0" cellspacing="0" border="0" align="center" class="innertable">
+                                    <tr>
+                                        <!-- article textarea -->
+                                        <td>
+                                            <table bgcolor="#ffffff" width="100%" cellpadding="10" cellspacing="0" border="0">
+                                                <tr>
+                                                    <td>
+                                                        <p style="margin-top:0; margin-bottom:0;">
+                                                            <?php
+                                                                include $view.'.view.php';
+                                                            ?>
+                                                        </p>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                        <!-- /article textarea -->
+                                    </tr>
+                                </table>
+                                <!-- /article -->
+
+                            </td>
+                        </tr>
+                        <!-- /CONTENT -->
+
+                        <!-- FOOTER -->
+                        <tr>
+                            <td bgcolor="#fdfdfd">
+                                <table width="100%" cellpadding="10" cellspacing="0" border="0">
+                                    <tr>
+                                        <td valign="top" style="font-size:11px; border-top:1px dashed #ccc; text-align:right;">
+                                            <p style="margin-top:0; margin-bottom:0;">© 2012 - 2013 <a href="http://monstra.org" style="color:#333; text-decoration:none;">MONSTRA.ORG</p>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                        <!-- /FOOTER -->
+
+                    </table>
+                </td>
+            </tr>
+        </table>
+        <!-- End of wrapper table -->
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/box/users/views/emails/new_password_email.view.php b/plugins/box/users/views/emails/new_password_email.view.php
new file mode 100644
index 0000000..5df6bea
--- /dev/null
+++ b/plugins/box/users/views/emails/new_password_email.view.php
@@ -0,0 +1,12 @@
+Dear <?php echo $user_login ?>,
+<br /><br />
+As you requested, your password has now been reset.<br/>
+Your new details are as follows:
+<br /><br />
+Username: <?php echo $user_login; ?><br />
+Password: <?php echo $new_password; ?>
+<br /><br />
+To change your password, please visit this page: <a href="<?php echo $site_url; ?>users/<?php echo $user_id; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url; ?>users/<?php echo $user_id; ?></a>
+<br /><br />
+All the best,<br />
+<?php echo $site_name; ?>
diff --git a/plugins/box/users/views/emails/new_user_email.view.php b/plugins/box/users/views/emails/new_user_email.view.php
new file mode 100644
index 0000000..1809b32
--- /dev/null
+++ b/plugins/box/users/views/emails/new_user_email.view.php
@@ -0,0 +1,8 @@
+Welcome to <?php echo $site_name; ?>!
+<br/><br/>
+Dear <?php echo $user_login; ?>,
+<br/><br/>
+Thanks for registering at <?php echo $site_name; ?>!<br /> We are glad you have chosen to be a part of our community and we hope you enjoy your stay.
+<br/><br/>
+All the best,<br/>
+<?php echo $site_name; ?>
diff --git a/plugins/box/users/views/emails/reset_password_email.view.php b/plugins/box/users/views/emails/reset_password_email.view.php
new file mode 100644
index 0000000..d4c2793
--- /dev/null
+++ b/plugins/box/users/views/emails/reset_password_email.view.php
@@ -0,0 +1,17 @@
+Dear <?php echo $user_login; ?>,
+<br /><br />
+You have requested to reset your password on <?php echo $site_name; ?> because you have forgotten your password.
+If you did not request this, please ignore it.
+<br /><br />
+To reset your password, please visit the following page:<br />
+<a href="<?php echo $site_url; ?>users/password-reset?hash=<?php echo $new_hash; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url; ?>users/password-reset?hash=<?php echo $new_hash; ?></a>
+<br /><br />
+When you visit that page, your password will be reset, and the new password will be emailed to you.
+<br /><br />
+Your username is: <?php echo $user_login; ?>
+<br /><br />
+To edit your profile, go to this page:<br />
+<a href="<?php echo $site_url ?>users/<?php echo $user_id; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url ?>users/<?php echo $user_id; ?></a>
+<br /><br />
+All the best,<br />
+<?php echo $site_name; ?>
diff --git a/plugins/box/users/views/frontend/new_password_email.view.php b/plugins/box/users/views/frontend/new_password_email.view.php
deleted file mode 100644
index 1154b15..0000000
--- a/plugins/box/users/views/frontend/new_password_email.view.php
+++ /dev/null
@@ -1,12 +0,0 @@
-Dear <?php echo $user_login ?>,
-
-As you requested, your password has now been reset. Your new details are as follows:
-
-Username: <?php echo $user_login; ?>
-
-Password: <?php echo $new_password; ?>
-
-To change your password, please visit this page: <?php echo $site_url; ?>users/<?php echo $user_id; ?>
-
-All the best,
-<?php echo $site_name; ?>
diff --git a/plugins/box/users/views/frontend/registration_email.view.php b/plugins/box/users/views/frontend/registration_email.view.php
deleted file mode 100644
index fe189f1..0000000
--- a/plugins/box/users/views/frontend/registration_email.view.php
+++ /dev/null
@@ -1,8 +0,0 @@
-Welcome to <?php echo $site_name; ?>!
-
-Dear <?php echo $user_login; ?>,
-
-Thanks for registering at <?php echo $site_name; ?>! We are glad you have chosen to be a part of our community and we hope you enjoy your stay.
-
-All the best,
-<?php echo $site_name; ?>
diff --git a/plugins/box/users/views/frontend/reset_password_email.view.php b/plugins/box/users/views/frontend/reset_password_email.view.php
deleted file mode 100644
index f957eab..0000000
--- a/plugins/box/users/views/frontend/reset_password_email.view.php
+++ /dev/null
@@ -1,17 +0,0 @@
-Dear <?php echo $user_login; ?>,
-
-You have requested to reset your password on <?php echo $site_name; ?> because you have forgotten your password.
-If you did not request this, please ignore it.
-
-To reset your password, please visit the following page:
-<?php echo $site_url; ?>users/password-reset?hash=<?php echo $new_hash; ?>
-
-When you visit that page, your password will be reset, and the new password will be emailed to you.
-
-Your username is: <?php echo $user_login; ?>
-
-To edit your profile, go to this page:
-<?php echo $site_url ?>users/<?php echo $user_id; ?>
-
-All the best,
-<?php echo $site_name; ?>