4 files changed, 90 insertions, 12 deletions
diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl
index 45d9e587c7..0e6b413cb9 100644
--- a/phpBB/templates/subSilver/posting_body.tpl
+++ b/phpBB/templates/subSilver/posting_body.tpl
@@ -355,10 +355,7 @@ function bbstyle(formObj, bbnumber) {
 		</span></td>
 	</tr>
 	<tr> 
-	  <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br />
-		<span class="gensmall">{L_HTML_IS} <u>{HTML_STATUS}</u><br />
-		{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />
-		{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
+	  <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td>
 	  <td class="row2"><span class="gen"> </span> 
 		<table cellspacing="0" cellpadding="1" border="0">
 		  <!-- BEGIN html_checkbox -->
@@ -424,7 +421,7 @@ function bbstyle(formObj, bbnumber) {
 		<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
 		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
 		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
-		<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="Spell Check" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
+		<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
 		<!-- End spellchecker option -->
 		&nbsp; 
 		<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" />
diff --git a/phpBB/templates/subSilver/profile_add_body.tpl b/phpBB/templates/subSilver/profile_add_body.tpl
index d04b76448a..119e3326cf 100644
--- a/phpBB/templates/subSilver/profile_add_body.tpl
+++ b/phpBB/templates/subSilver/profile_add_body.tpl
@@ -108,12 +108,7 @@
 	  </td>
 	</tr>
 	<tr> 
-	  <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br />
-		<span class="gensmall">{L_SIGNATURE_EXPLAIN}<br />
-		<br />
-		{L_HTML_IS} <u>{HTML_STATUS}</u><br />
-		{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />
-		{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
+	  <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td>
 	  <td class="row2"> 
 		<textarea name="signature"style="width: 300px"  rows="6" cols="30" class="post">{SIGNATURE}</textarea>
 	  </td>
diff --git a/phpBB/templates/subSilver/profile_send_email.tpl b/phpBB/templates/subSilver/profile_send_email.tpl
new file mode 100644
index 0000000000..593ae65e36
--- /dev/null
+++ b/phpBB/templates/subSilver/profile_send_email.tpl
@@ -0,0 +1,86 @@
+
+<!-- Spell checker option part 1: You must sign up for free at www.spellchecker.net to use this option -->
+<!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
+<!-- Remember to uncomment the spellchecker button near the end of this template -->
+<script type="text/javascript" language="javascript" src=spellcheck/spch.js></script>
+<!-- End spellchecker option -->
+
+<script language="JavaScript" type="text/javascript">
+<!--
+function checkForm(formObj) {
+
+	formErrors = false;    
+
+	if (formObj.message.value.length < 2) {
+		formErrors = "You must enter a message!";
+	}
+	else if ( formObj.subject.value.length < 2)
+	{
+		formErrors = "You must enter a subject!";
+	}
+
+	if (formErrors) {
+		alert(formErrors);
+		return false;
+	}
+}
+//-->
+</script>
+
+<form action="{S_POST_ACTION}" method="post" name="post" onSubmit="return checkForm(this)">
+
+{ERROR_BOX}
+
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+	<tr>
+		<td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+	</tr>
+</table>
+
+<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
+	<tr> 
+		<th class="thHead" colspan="2" height="25"><b>{L_SEND_EMAIL_MSG}</b></th>
+	</tr>
+	<tr> 
+		<td class="row1" width="22%"><span class="gen"><b>{L_RECIPIENT}</b></span></td>
+		<td class="row2" width="78%"><span class="gen"><b>{USERNAME}</b></span> </td>
+	</tr>
+	<tr> 
+		<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
+		<td class="row2" width="78%"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></span> </td>
+	</tr>
+	<tr> 
+		<td class="row1" valign="top"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><span class="gensmall">{L_MESSAGE_BODY_DESC}</span></td>
+		<td class="row2"><span class="gen"><textarea name="message" rows="25" cols="40" wrap="virtual" style="width:500px" tabindex="3" class="post">{MESSAGE}</textarea></span></td>
+	</tr>
+	<tr> 
+		<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
+		<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
+			<tr> 
+				<td><input type="checkbox" name="cc_email"  value="1" checked="checked" /></td>
+				<td><span class="gen">{L_CC_EMAIL}</span></td>
+			</tr>
+		</table></td>
+	</tr>
+	<tr>
+		<td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
+		<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
+		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
+		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
+		<input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" />
+		<!-- End spellchecker option -->
+		&nbsp;<input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SEND_EMAIL}" /></td>
+	</tr>
+</table>
+
+<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+	<tr> 
+		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
+	</tr>
+</table></form>
+
+<table width="100%" cellspacing="2" border="0" align="center">
+	<tr>
+		<td valign="top" align="right">{JUMPBOX}</td>
+	</tr>
+</table>
diff --git a/phpBB/templates/subSilver/profile_view_body.tpl b/phpBB/templates/subSilver/profile_view_body.tpl
index 20601b2d2e..a9408a8508 100644
--- a/phpBB/templates/subSilver/profile_view_body.tpl
+++ b/phpBB/templates/subSilver/profile_view_body.tpl
@@ -56,7 +56,7 @@
 	  <table width="100%" border="0" cellspacing="1" cellpadding="3">
 		<tr> 
 		  <td valign="middle" align="right"><span class="gen">{L_EMAIL_ADDRESS}:</span></td>
-		  <td class="row1" valign="middle" width="100%"><b><span class="gen">{EMAIL}</span></b></td>
+		  <td class="row1" valign="middle" width="100%"><b><span class="gen">{EMAIL_IMG}</span></b></td>
 		</tr>
 		<tr> 
 		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_PM}:</span></td>