diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index a179d17d07..51f703529b 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -547,7 +547,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                             draft.content = true;
                             draft.received = new Date().getTime();
                             draft.seen = false;
-                            draft.answered =false;
+                            draft.answered = false;
                             draft.flagged = false;
                             draft.ui_seen = false;
                             draft.ui_answered = false;
@@ -1078,6 +1078,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         Bundle args = new Bundle();
         args.putLong("account", intent.getLongExtra("account", -1));
         args.putLong("folder", intent.getLongExtra("folder", -1));
+        args.putBoolean("outgoing", intent.getBooleanExtra("outgoing", false));
 
         FragmentMessages fragment = new FragmentMessages();
         fragment.setArguments(args);
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index b6380b3df0..4d5db0b6bb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -158,7 +158,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             lbm.sendBroadcast(
                     new Intent(ActivityView.ACTION_VIEW_MESSAGES)
                             .putExtra("account", folder.account)
-                            .putExtra("folder", folder.id));
+                            .putExtra("folder", folder.id)
+                            .putExtra("outgoing", folder.isOutgoing()));
         }
 
         @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6df3f21e9b..93f1dea575 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -109,6 +109,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
     private LifecycleOwner owner;
     private FragmentManager fragmentManager;
     private ViewType viewType;
+    private boolean outgoing;
     private IProperties properties;
 
     private boolean compact;
@@ -307,7 +308,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             pbLoading.setVisibility(View.GONE);
 
             boolean photo = false;
-            if (avatars) {
+            if (avatars && !outgoing) {
                 if (message.avatar != null)
                     try {
                         ContentResolver resolver = context.getContentResolver();
@@ -342,7 +343,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             else
                 ivFlagged.setVisibility(message.count - message.unflagged > 0 ? View.VISIBLE : View.GONE);
 
-            tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, !compact));
+            tvFrom.setText(MessageHelper.getFormattedAddresses(outgoing ? message.to : message.from, !compact));
             tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received));
 
             tvSize.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true));
@@ -1361,12 +1362,14 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         }
     }
 
-    AdapterMessage(Context context, LifecycleOwner owner, FragmentManager fragmentManager, ViewType viewType, IProperties properties) {
+    AdapterMessage(Context context, LifecycleOwner owner, FragmentManager fragmentManager,
+                   ViewType viewType, boolean outgoing, IProperties properties) {
         super(DIFF_CALLBACK);
         this.context = context;
         this.owner = owner;
         this.fragmentManager = fragmentManager;
         this.viewType = viewType;
+        this.outgoing = outgoing;
         this.properties = properties;
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 915748ca33..4c2ff3435c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -89,8 +89,9 @@ public class FragmentMessages extends FragmentEx {
     private FloatingActionButton fab;
     private FloatingActionButton fabMore;
 
-    private long folder = -1;
     private long account = -1;
+    private long folder = -1;
+    private boolean outgoing = false;
     private String thread = null;
     private boolean found = false;
     private String search = null;
@@ -133,6 +134,7 @@ public class FragmentMessages extends FragmentEx {
         Bundle args = getArguments();
         account = args.getLong("account", -1);
         folder = args.getLong("folder", -1);
+        outgoing = args.getBoolean("outgoing", false);
         thread = args.getString("thread");
         found = args.getBoolean("found", false);
         search = args.getString("search");
@@ -221,109 +223,112 @@ public class FragmentMessages extends FragmentEx {
         LinearLayoutManager llm = new LinearLayoutManager(getContext());
         rvMessage.setLayoutManager(llm);
 
-        adapter = new AdapterMessage(getContext(), getViewLifecycleOwner(), getFragmentManager(), viewType, new AdapterMessage.IProperties() {
-            @Override
-            public void setExpanded(long id, boolean expand) {
-                if (expand) {
-                    expanded.add(id);
-                    handleExpand(id);
-                } else
-                    expanded.remove(id);
-            }
-
-            @Override
-            public void setAddresses(long id, boolean show) {
-                if (show)
-                    addresses.remove(id);
-                else
-                    addresses.add(id);
-            }
-
-            @Override
-            public void setHeaders(long id, boolean show) {
-                if (show)
-                    headers.add(id);
-                else
-                    headers.remove(id);
-            }
-
-            @Override
-            public void setImages(long id, boolean show) {
-                if (show)
-                    images.add(id);
-                else
-                    images.remove(id);
-            }
-
-            @Override
-            public boolean isExpanded(long id) {
-                return expanded.contains(id);
-            }
-
-            @Override
-            public boolean showAddresses(long id) {
-                return !addresses.contains(id);
-            }
-
-            @Override
-            public boolean showHeaders(long id) {
-                return headers.contains(id);
-            }
-
-            @Override
-            public boolean showImages(long id) {
-                return images.contains(id);
-            }
-
-            @Override
-            public void move(long id, String name, boolean type) {
-                Bundle args = new Bundle();
-                args.putLong("id", id);
-                args.putString("name", name);
-                args.putBoolean("type", type);
-
-                new SimpleTask<MessageTarget>() {
+        adapter = new AdapterMessage(
+                getContext(), getViewLifecycleOwner(), getFragmentManager(),
+                viewType, outgoing,
+                new AdapterMessage.IProperties() {
                     @Override
-                    protected MessageTarget onLoad(Context context, Bundle args) {
-                        long id = args.getLong("id");
-                        String name = args.getString("name");
-                        boolean type = args.getBoolean("type");
-
-                        MessageTarget result = new MessageTarget();
-
-                        DB db = DB.getInstance(context);
-                        try {
-                            db.beginTransaction();
-
-                            EntityMessage message = db.message().getMessage(id);
-                            if (type)
-                                result.target = db.folder().getFolderByType(message.account, name);
-                            else
-                                result.target = db.folder().getFolderByName(message.account, name);
-                            result.ids.add(message.id);
-
-                            db.message().setMessageUiHide(id, true);
-
-                            db.setTransactionSuccessful();
-                        } finally {
-                            db.endTransaction();
-                        }
-
-                        return result;
+                    public void setExpanded(long id, boolean expand) {
+                        if (expand) {
+                            expanded.add(id);
+                            handleExpand(id);
+                        } else
+                            expanded.remove(id);
                     }
 
                     @Override
-                    protected void onLoaded(Bundle args, MessageTarget result) {
-                        moveUndo(result);
+                    public void setAddresses(long id, boolean show) {
+                        if (show)
+                            addresses.remove(id);
+                        else
+                            addresses.add(id);
                     }
 
                     @Override
-                    protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getContext(), ex);
+                    public void setHeaders(long id, boolean show) {
+                        if (show)
+                            headers.add(id);
+                        else
+                            headers.remove(id);
                     }
-                }.load(FragmentMessages.this, args);
-            }
-        });
+
+                    @Override
+                    public void setImages(long id, boolean show) {
+                        if (show)
+                            images.add(id);
+                        else
+                            images.remove(id);
+                    }
+
+                    @Override
+                    public boolean isExpanded(long id) {
+                        return expanded.contains(id);
+                    }
+
+                    @Override
+                    public boolean showAddresses(long id) {
+                        return !addresses.contains(id);
+                    }
+
+                    @Override
+                    public boolean showHeaders(long id) {
+                        return headers.contains(id);
+                    }
+
+                    @Override
+                    public boolean showImages(long id) {
+                        return images.contains(id);
+                    }
+
+                    @Override
+                    public void move(long id, String name, boolean type) {
+                        Bundle args = new Bundle();
+                        args.putLong("id", id);
+                        args.putString("name", name);
+                        args.putBoolean("type", type);
+
+                        new SimpleTask<MessageTarget>() {
+                            @Override
+                            protected MessageTarget onLoad(Context context, Bundle args) {
+                                long id = args.getLong("id");
+                                String name = args.getString("name");
+                                boolean type = args.getBoolean("type");
+
+                                MessageTarget result = new MessageTarget();
+
+                                DB db = DB.getInstance(context);
+                                try {
+                                    db.beginTransaction();
+
+                                    EntityMessage message = db.message().getMessage(id);
+                                    if (type)
+                                        result.target = db.folder().getFolderByType(message.account, name);
+                                    else
+                                        result.target = db.folder().getFolderByName(message.account, name);
+                                    result.ids.add(message.id);
+
+                                    db.message().setMessageUiHide(id, true);
+
+                                    db.setTransactionSuccessful();
+                                } finally {
+                                    db.endTransaction();
+                                }
+
+                                return result;
+                            }
+
+                            @Override
+                            protected void onLoaded(Bundle args, MessageTarget result) {
+                                moveUndo(result);
+                            }
+
+                            @Override
+                            protected void onException(Bundle args, Throwable ex) {
+                                Helper.unexpectedError(getContext(), ex);
+                            }
+                        }.load(FragmentMessages.this, args);
+                    }
+                });
 
         rvMessage.setAdapter(adapter);