diff --git a/view/theme/quattro/smarty3/prv_message.tpl b/view/theme/quattro/smarty3/prv_message.tpl
index 78ff7e784..26b14d6e0 100644
--- a/view/theme/quattro/smarty3/prv_message.tpl
+++ b/view/theme/quattro/smarty3/prv_message.tpl
@@ -12,7 +12,12 @@
 {{$parent}}
 
 <div id="prvmail-to-label">{{$to}}</div>
+{{if $showinputs}}
+<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
 {{$select}}
+{{/if}}
 
 <div id="prvmail-subject-label">{{$subject}}</div>
 <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
diff --git a/view/theme/vier/smarty3/profile_vcard.tpl b/view/theme/vier/smarty3/profile_vcard.tpl
index d1634a7fa..9e0da287c 100644
--- a/view/theme/vier/smarty3/profile_vcard.tpl
+++ b/view/theme/vier/smarty3/profile_vcard.tpl
@@ -23,7 +23,7 @@
 			</ul>
 			</div>
 		{{else}}
-			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
+			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
 		{{/if}}
 	</div>