diff --git a/astrid/res/values/strings-updates.xml b/astrid/res/values/strings-updates.xml
index eff8ea55f..0e83d4b71 100644
--- a/astrid/res/values/strings-updates.xml
+++ b/astrid/res/values/strings-updates.xml
@@ -4,19 +4,22 @@
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
     
+    <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
+    Please do not translate this part of the string. -->
+    
     <string name="update_string_friends">%1$s is now friends with %2$s</string>
     <string name="update_string_request_friendship">%1$s wants to be friends with you</string>
     <string name="update_string_confirmed_friendship">%1$s has confirmed your friendship request</string>
     <string name="update_string_task_created">%1$s created this task</string>
-    <string name="update_string_task_created_global">%1$s created @link_task</string>
-    <string name="update_string_task_created_on_list">%1$s added @link_task to this list</string>
-    <string name="update_string_task_completed">%1$s completed @link_task. Huzzah!</string>
-    <string name="update_string_task_uncompleted">%1$s un-completed @link_task.</string>
-    <string name="update_string_task_tagged">%1$s added @link_task to %4$s</string>
-    <string name="update_string_task_tagged_list">%1$s added @link_task to this list</string>
-    <string name="update_string_task_assigned">%1$s assigned @link_task to %4$s</string>
+    <string name="update_string_task_created_global">%1$s created $link_task</string>
+    <string name="update_string_task_created_on_list">%1$s added $link_task to this list</string>
+    <string name="update_string_task_completed">%1$s completed $link_task. Huzzah!</string>
+    <string name="update_string_task_uncompleted">%1$s un-completed $link_task.</string>
+    <string name="update_string_task_tagged">%1$s added $link_task to %4$s</string>
+    <string name="update_string_task_tagged_list">%1$s added $link_task to this list</string>
+    <string name="update_string_task_assigned">%1$s assigned $link_task to %4$s</string>
     <string name="update_string_default_comment">%1$s commented: %3$s</string>
-    <string name="update_string_task_comment">%1$s Re: @link_task: %3$s</string>
+    <string name="update_string_task_comment">%1$s Re: $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
     <string name="update_string_tag_created">%1$s created this list</string>
     <string name="update_string_tag_created_global">%1$s created the list %2$s</string>
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index 65f69286b..6a80afe14 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -60,12 +60,10 @@ public class UpdateAdapter extends CursorAdapter {
     private final String linkColor;
     private final String fromView;
 
-    private static final String TARGET_LINK_PREFIX = "@link_"; //$NON-NLS-1$
-    private static final String TARGET_LINK_EXPR = TARGET_LINK_PREFIX + "(\\w*)"; //$NON-NLS-1$
+    private static final String TARGET_LINK_PREFIX = "$link_"; //$NON-NLS-1$
+    private static final Pattern TARGET_LINK_PATTERN = Pattern.compile("\\" + TARGET_LINK_PREFIX + "(\\w*)");  //$NON-NLS-1$//$NON-NLS-2$
     private static final String TASK_LINK_TYPE = "task"; //$NON-NLS-1$
 
-    private static final Pattern TARGET_LINK_PATTERN = Pattern.compile(TARGET_LINK_EXPR);
-
     private static final String UPDATE_FRIENDS = "friends";  //$NON-NLS-1$
     private static final String UPDATE_REQUEST_FRIENDSHIP = "request_friendship"; //$NON-NLS-1$
     private static final String UPDATE_CONFIRMED_FRIENDSHIP = "confirmed_friendship"; //$NON-NLS-1$