3 files changed, 39 insertions, 1 deletions
diff --git a/app/views/comment/_single_comment.rhtml b/app/views/comment/_single_comment.rhtml
index 1909c7f36..0096e9314 100644
--- a/app/views/comment/_single_comment.rhtml
+++ b/app/views/comment/_single_comment.rhtml
@@ -1,11 +1,20 @@
 <div class="comment_in_request" id="comment-<%=comment.id.to_s%>">
+    <% if comment.user && comment.user.profile_photo %>
+        <div class="user_photo_on_comment">
+            <img src="<%= get_profile_photo_url(:url_name => comment.user.url_name) %>">
+        </div>
+    <% end %>
+
     <h2>
         <%# When not logged in, but mid-comment-leaving, there'll be no comment.user %>
         <%= comment.user ? user_link(comment.user) : "You" %>
         left an annotation (<%= simple_date(comment.created_at || Time.now) %>)
     </h2>
     <div class="comment_in_request_text"> 
-        <p><img class="comment_quote" src="/images/quote.png" alt=""><%= comment.get_body_for_html_display %></p>
+        <p>
+        <img class="comment_quote" src="/images/quote.png" alt="">
+        <%= comment.get_body_for_html_display %>
+        </p>
     </div>
     <p class="event_actions">
         <% if !comment.id.nil? %>
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml
index 0756b0797..1943d2de8 100644
--- a/app/views/request/_correspondence.rhtml
+++ b/app/views/request/_correspondence.rhtml
@@ -34,6 +34,13 @@ elsif [ 'sent', 'followup_sent' ].include?(info_request_event.event_type)
     outgoing_message = info_request_event.outgoing_message
     %>
     <div class="correspondence" id="outgoing-<%=outgoing_message.id.to_s%>">
+
+        <% if @info_request.user.profile_photo %>
+        <p class="user_photo_on_correspondence">
+            <img src="<%= get_profile_photo_url(:url_name => @info_request.user.url_name) %>">
+        </p>
+        <% end %>
+
         <h2>
         <%=h @info_request.user.name %><br>
         <br><%= simple_date(info_request_event.created_at) %>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 741e895f5..2beeca16b 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -1125,6 +1125,28 @@ div.act_link img {
     padding: 2px;
 }
 
+.user_photo_on_correspondence img {
+    width: 48px;
+    height: 48px;
+    float: right;
+    vertical-align: middle;
+    text-align: center;
+    border: 1px solid #dddddd;
+    margin-left: 5px;
+    padding: 2px;
+}
+
+.user_photo_on_comment img { 
+    width: 24px; 
+    height: 24px; 
+    float: left; 
+    vertical-align: middle;
+    border: 1px solid #dddddd;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 2px;
+}
+
 #user_change_password_email, #user_not_logged_in {
     clear: left;
 }