4 files changed, 88 insertions, 4 deletions
diff --git a/view/cmnt_received_eml.tpl b/view/cmnt_received_eml.tpl
new file mode 100644
index 000000000..8205831aa
--- /dev/null
+++ b/view/cmnt_received_eml.tpl
@@ -0,0 +1,16 @@
+
+Dear $username,
+
+	'$from' commented on an item/conversation which you have been following.
+
+-----
+$body
+-----
+
+Please login at $siteurl to view the complete conversation.
+
+Thank you,
+	$sitename administrator
+
+ 
+
diff --git a/view/settings.tpl b/view/settings.tpl
index 658c0b685..a918aefc1 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -37,7 +37,25 @@ $zoneselect
 </div>
 <div id="settings-default-perms-end"></div>
 
-
+<div id="settings-notify-wrapper">
+<div id="settings-notify-desc">Send me a notification email when: </div>
+<label for="notify1" id="settings-label-notify1">I receive an introduction</label>
+<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
+<div id="notify1-end"></div>
+<label for="notify2" id="settings-label-notify2">My introductions are confirmed</label>
+<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
+<div id="notify2-end"></div>
+<label for="notify3" id="settings-label-notify3">Someone writes on my profile wall</label>
+<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
+<div id="notify3-end"></div>
+<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
+<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
+<div id="notify4-end"></div>
+<label for="notify5" id="settings-label-notify5">I receive a private message</label>
+<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
+<div id="notify5-end"></div>
+</div>
+<div id="settings=notify-end"></div>
 
 <div id="settings-password-wrapper" >
 <p id="settings-password-desc" >
diff --git a/view/style.css b/view/style.css
index 91a4d3232..788a18349 100644
--- a/view/style.css
+++ b/view/style.css
@@ -298,21 +298,55 @@ input#dfrn-url {
 	margin-bottom: 30px;
 }
 
-#settings-username-end, #settings-email-end, #settings-nick-end, #settings-timezone-end, #settings-password-end, #settings-confirm-end {
+#settings-username-end, 
+#settings-email-end, 
+#settings-nick-end, 
+#settings-timezone-end, 
+#settings-password-end, 
+#settings-confirm-end,
+#notify1-end,
+#notify2-end,
+#notify3-end,
+#notify4-end,
+#notify5-end {
 	margin-bottom: 5px;
 	clear: both;
 }
 
-#settings-username-label, #settings-email-label, #settings-nick-label, #settings-timezone-label, #settings-password-label, #settings-confirm-label {
+#settings-username-label, 
+#settings-email-label, 
+#settings-nick-label, 
+#settings-timezone-label, 
+#settings-password-label, 
+#settings-confirm-label,
+#settings-label-notify1,
+#settings-label-notify2,
+#settings-label-notify3,
+#settings-label-notify4,
+#settings-label-notify5 {
 	float: left;
 	width: 200px;
 }
 
-#settings-username, #settings-email, #settings-nick, #timezone-select, #settings-password, #settings-confirm {
+#settings-username, 
+#settings-email, 
+#settings-nick, 
+#timezone-select, 
+#settings-password, 
+#settings-confirm,
+#notify1,
+#notify2,
+#notify3,
+#notify4,
+#notify5 {
 	float: left;
 	margin-bottom: 20px;
 }
 
+#settings-notify-desc {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
 #settings-nick-desc {
 	width: 500px;
 }
diff --git a/view/wall_received_eml.tpl b/view/wall_received_eml.tpl
new file mode 100644
index 000000000..cd3e18a5c
--- /dev/null
+++ b/view/wall_received_eml.tpl
@@ -0,0 +1,16 @@
+
+Dear $username,
+
+	'$from' posted something to your profile wall.
+
+-----
+$body
+-----
+
+Please login at $siteurl to view or delete the item.
+
+Thank you,
+	$sitename administrator
+
+ 
+