diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java
index 886036920..9f16afdac 100644
--- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java
@@ -89,7 +89,6 @@ public class ParcelableStatusUpdate implements Parcelable {
     @ParcelableThisPlease
     @Draft.Action
     public String draft_action;
-    @JsonField(name = "draft_extras")
     @ParcelableThisPlease
     @Nullable
     public ActionExtras draft_extras;
@@ -111,6 +110,14 @@ public class ParcelableStatusUpdate implements Parcelable {
                 ", in_reply_to_status=" + in_reply_to_status +
                 ", is_possibly_sensitive=" + is_possibly_sensitive +
                 ", repost_status_id='" + repost_status_id + '\'' +
+                ", attachment_url='" + attachment_url + '\'' +
+                ", excluded_reply_user_ids=" + Arrays.toString(excluded_reply_user_ids) +
+                ", extended_reply_mode=" + extended_reply_mode +
+                ", summary='" + summary + '\'' +
+                ", visibility='" + visibility + '\'' +
+                ", draft_unique_id='" + draft_unique_id + '\'' +
+                ", draft_action='" + draft_action + '\'' +
+                ", draft_extras=" + draft_extras +
                 '}';
     }
 
diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java
index 7cdd43d94..d0c45660e 100644
--- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java
@@ -80,6 +80,7 @@ public class DraftExtrasFieldConverter implements CursorFieldConverter<ActionExt
     }
 
     public static String serializeExtras(final ActionExtras object) throws IOException {
+        if (object == null) return null;
         return LoganSquare.serialize(object);
     }
 }