diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/PhotoLayoutHelper.java b/mastodon/src/main/java/org/joinmastodon/android/ui/PhotoLayoutHelper.java
index b6fb50fb1..813ce3edb 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/PhotoLayoutHelper.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/PhotoLayoutHelper.java
@@ -385,6 +385,8 @@ public class PhotoLayoutHelper{
 					return CORNER_BL | CORNER_BR;
 				}else if(startCol==0 && startRow==0 && rowSpan==rowCount){ // Left attachment in a vertical layout
 					return CORNER_TL | CORNER_BL;
+				}else if(startCol==columnCount-1 && startRow==0 && rowSpan==rowCount){ // Right attachment
+					return CORNER_TR | CORNER_BR;
 				}else if(startCol==0 && startRow==0){ // Top left
 					return CORNER_TL;
 				}else if(startCol==columnCount-colSpan && startRow==0){ // Top right
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
index bbfb37e7b..613e7815e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
@@ -48,6 +48,10 @@ public class MediaAttachmentViewController{
 				outline.setRoundRect(0, 0, view.getWidth(), view.getHeight()+radius, radius);
 			}else if(mask==(PhotoLayoutHelper.CORNER_BL | PhotoLayoutHelper.CORNER_BR)){
 				outline.setRoundRect(0, -radius, view.getWidth(), view.getHeight(), radius);
+			}else if(mask==(PhotoLayoutHelper.CORNER_TL | PhotoLayoutHelper.CORNER_BL)){
+				outline.setRoundRect(0, 0, view.getWidth()+radius, view.getHeight(), radius);
+			}else if(mask==(PhotoLayoutHelper.CORNER_TR | PhotoLayoutHelper.CORNER_BR)){
+				outline.setRoundRect(-radius, 0, view.getWidth(), view.getHeight(), radius);
 			}else if(mask==PhotoLayoutHelper.CORNER_TL){
 				outline.setRoundRect(0, 0, view.getWidth()+radius, view.getHeight()+radius, radius);
 			}else if(mask==PhotoLayoutHelper.CORNER_TR){