diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
index e99bbf672..22155a939 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
@@ -236,13 +236,15 @@ public class TagUpdatesActivity extends ListActivity {
         updateDao.createNew(update);
 
         final long updateId = update.getId();
+        final Bitmap tempPicture = picture;
         new Thread() {
             @Override
             public void run() {
-                actFmSyncService.pushUpdate(updateId, picture);
+                actFmSyncService.pushUpdate(updateId, tempPicture);
             }
         }.start();
         addCommentField.setText(""); //$NON-NLS-1$
+        picture = null;
         pictureButton.setImageResource(R.drawable.icn_camera);
         refreshUpdatesList();
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 734c74ded..302a61b46 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -426,7 +426,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
              */
             @Override
             public boolean onEditorAction(TextView view, int actionId, KeyEvent event) {
-                if(actionId == EditorInfo.IME_NULL && quickAddBox.getText().length() > 0) {
+                if(actionId == EditorInfo.IME_NULL && !TextUtils.isEmpty(quickAddBox.getText().toString().trim())) {
                     quickAddTask(quickAddBox.getText().toString(), true);
                     return true;
                 }