am f274c580: (-s ours) am f5d96496: Introduce web and email mode (DO NOT MERGE)

* commit 'f274c5800baafe4e6b84fc1381ada3b5a287b225':
  Introduce web and email mode (DO NOT MERGE)