- Sone currentSone = getCurrentSone(request.getToadletContext());
- Sone sender = webInterface.getCore().getLocalSone(senderId, false);
- if (sender == null) {
- sender = currentSone;
+ Optional<Sone> recipient = webInterface.getCore().getSone(recipientId);
+ Optional<LocalSone> sender = webInterface.getCore().getLocalSone(senderId);
+ if (!sender.isPresent()) {
+ sender = getCurrentSone(request.getToadletContext());