diff --git a/scss/images.scss b/scss/images.scss
index 4c495b6..a988f6a 100644
--- a/scss/images.scss
+++ b/scss/images.scss
@@ -15,15 +15,15 @@ ul {
 .imagebox {
     display: block;
     max-width: 400px;
-    max-height: 400px;
 
-    img {
-        max-width: 400px;
+    img,
+    video {
         max-height: 400px;
     }
 }
 
-img {
+img,
+video {
     background-color: #f5f5f5;
     border: 1px solid #e5e5e5;
     border-radius: 3px;
diff --git a/src/main.rs b/src/main.rs
index eb86fc9..de64006 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -60,6 +60,13 @@ impl Config {
         url.to_string()
     }
 
+    fn upstream_details_url(&self, name: &str) -> String {
+        let mut url = self.upstream.clone();
+        url.set_path(&format!("image/details/original/{}", name));
+
+        url.to_string()
+    }
+
     fn upstream_image_url(&self, name: &str) -> String {
         let mut url = self.upstream.clone();
         url.set_path(&format!("image/original/{}", name));
@@ -179,10 +186,16 @@ impl Images {
     }
 }
 
+#[derive(Debug, serde::Deserialize)]
+pub struct Details {
+    content_type: String,
+}
+
 #[derive(Debug, serde::Deserialize)]
 pub struct Image {
     file: String,
     delete_token: String,
+    details: Details,
 }
 
 impl Image {
@@ -190,6 +203,14 @@ impl Image {
         &self.file
     }
 
+    fn is_video(&self) -> bool {
+        self.details.content_type.starts_with("video")
+    }
+
+    fn mime(&self) -> &str {
+        &self.details.content_type
+    }
+
     fn link(&self) -> String {
         CONFIG.image_url(&self.file)
     }
@@ -298,16 +319,19 @@ async fn thumbs(
 ) -> Result<HttpResponse, Error> {
     let file = query.into_inner().image;
 
-    let url = CONFIG.upstream_image_url(&file);
-    let res = client.get(url).send().await?;
+    let url = CONFIG.upstream_details_url(&file);
+    let mut res = client.get(url).send().await?;
 
     if res.status() == StatusCode::NOT_FOUND {
         return Ok(to_404());
     }
 
+    let details: Details = res.json().await?;
+
     let image = Image {
         file,
         delete_token: String::new(),
+        details,
     };
 
     let mut cursor = Cursor::new(vec![]);
@@ -351,16 +375,19 @@ async fn view_original(
 ) -> Result<HttpResponse, Error> {
     let file = file.into_inner();
 
-    let url = CONFIG.upstream_image_url(&file);
-    let res = client.get(url).send().await?;
+    let url = CONFIG.upstream_details_url(&file);
+    let mut res = client.get(url).send().await?;
 
     if res.status() == StatusCode::NOT_FOUND {
         return Ok(to_404());
     }
 
+    let details: Details = res.json().await?;
+
     let image = Image {
         file,
         delete_token: String::new(),
+        details,
     };
 
     let mut cursor = Cursor::new(vec![]);
@@ -381,16 +408,19 @@ async fn view(
         return Ok(to_404());
     }
 
-    let url = CONFIG.upstream_image_url(&file);
-    let res = client.get(url).send().await?;
+    let url = CONFIG.upstream_details_url(&file);
+    let mut res = client.get(url).send().await?;
 
     if res.status() == StatusCode::NOT_FOUND {
         return Ok(to_404());
     }
 
+    let details: Details = res.json().await?;
+
     let image = Image {
         file,
         delete_token: String::new(),
+        details,
     };
 
     let mut cursor = Cursor::new(vec![]);
@@ -468,8 +498,8 @@ async fn delete(
         confirm,
     } = query.into_inner();
 
-    let url = CONFIG.upstream_image_url(&file);
-    let res = client.get(url).send().await?;
+    let url = CONFIG.upstream_details_url(&file);
+    let mut res = client.get(url).send().await?;
 
     if res.status() == StatusCode::NOT_FOUND {
         return Ok(to_404());
@@ -482,11 +512,14 @@ async fn delete(
 
         self::templates::deleted(&mut cursor, &file)?;
     } else {
+        let details: Details = res.json().await?;
+
         self::templates::confirm_delete(
             &mut cursor,
             &Image {
                 file,
                 delete_token: token,
+                details,
             },
         )?;
     }
@@ -507,7 +540,9 @@ async fn not_found() -> Result<HttpResponse, Error> {
 
     self::templates::not_found(&mut cursor)?;
 
-    Ok(HttpResponse::NotFound().body(cursor.into_inner()))
+    Ok(HttpResponse::NotFound()
+        .content_type(mime::TEXT_HTML.essence_str())
+        .body(cursor.into_inner()))
 }
 
 async fn go_home() -> HttpResponse {
diff --git a/templates/view.rs.html b/templates/view.rs.html
index 3ed0737..4e74a40 100644
--- a/templates/view.rs.html
+++ b/templates/view.rs.html
@@ -25,8 +25,22 @@
                     </picture>
                     <p><a href="@image.thumb(size, FileType::Jpg)">Direct Link</a></p>
                 } else {
-                    <img src="@image.link()" alt="@image.filename()" title="@image.filename()" />
-                    <p><a href="@image.link()">Direct Link</a></p>
+                    @if image.is_video() {
+                        <video
+                            src="@image.link()"
+                            alt="@image.filename()"
+                            title="@image.filename()"
+                            type="@image.mime()"
+                            autoplay
+                            muted
+                            loop
+                        >
+                        </video>
+                        <p><a href="@image.link()">Direct Link</a></p>
+                    } else {
+                        <img src="@image.link()" alt="@image.filename()" title="@image.filename()" />
+                        <p><a href="@image.link()">Direct Link</a></p>
+                    }
                 }
             </div>
         </article>