diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
index b27fe24ef..7bfd36f04 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
@@ -229,7 +229,7 @@ public class NameMaps {
         putUserActivityPropertyToServerName(UserActivity.USER_UUID,   "user_id",     false);
         putUserActivityPropertyToServerName(UserActivity.ACTION,      "action",      false);
         putUserActivityPropertyToServerName(UserActivity.MESSAGE,     "message",     false);
-        putUserActivityPropertyToServerName(UserActivity.PICTURE,     "picture",     false);
+        putUserActivityPropertyToServerName(UserActivity.PICTURE,     "picture",     true);
         putUserActivityPropertyToServerName(UserActivity.TARGET_ID,   "target_id",   false);
         putUserActivityPropertyToServerName(UserActivity.TARGET_NAME, "target_name", false);
         putUserActivityPropertyToServerName(UserActivity.CREATED_AT,  "created_at",  false);
@@ -237,7 +237,7 @@ public class NameMaps {
 
 
         // Reverse the mapping to construct the server to local map
-        USER_ACTIVITY_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(USER_PROPERTIES_LOCAL_TO_SERVER);
+        USER_ACTIVITY_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(USER_ACTIVITY_PROPERTIES_LOCAL_TO_SERVER);
     }
 
 
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index adc7ee594..7fdb6e16f 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -148,7 +148,6 @@ public class UpdateAdapter extends CursorAdapter {
     public synchronized void setFieldContentsAndVisibility(View view, UserActivity activity, User user) {
         // picture
         final AsyncImageView pictureView = (AsyncImageView)view.findViewById(R.id.picture); {
-
             String pictureUrl = user.getPictureUrl(User.PICTURE, RemoteModel.PICTURE_THUMB);
             pictureView.setUrl(pictureUrl);
         }
@@ -249,7 +248,7 @@ public class UpdateAdapter extends CursorAdapter {
             else
                 commentResource = R.string.update_string_task_comment;
         } else if (UserActivity.ACTION_TAG_COMMENT.equals(action)) {
-            if (fromView.equals(FROM_TAG_VIEW)  || TextUtils.isEmpty(targetName))
+            if (fromView.equals(FROM_TAG_VIEW) || TextUtils.isEmpty(targetName))
                 commentResource = R.string.update_string_default_comment;
             else
                 commentResource = R.string.update_string_tag_comment;