diff --git a/src/App.jsx b/src/App.jsx
index c902699..62af8c0 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -3,6 +3,8 @@ import { useState } from 'react'
 import initialEmails from './data/emails'
 
 import './styles/App.css'
+import Emails from './components/Emails'
+import EmailView from './components/EmailView'
 
 const getReadEmails = emails => emails.filter(email => !email.read)
 
@@ -12,6 +14,7 @@ function App() {
   const [emails, setEmails] = useState(initialEmails)
   const [hideRead, setHideRead] = useState(false)
   const [currentTab, setCurrentTab] = useState('inbox')
+  const [selectedEmail, setSelectedEmail] = useState(null)
 
   const unreadEmails = emails.filter(email => !email.read)
   const starredEmails = emails.filter(email => email.starred)
@@ -88,34 +91,21 @@ function App() {
         </ul>
       </nav>
       <main className="emails">
-        <ul>
-          {filteredEmails.map((email, index) => (
-            <li
-              key={index}
-              className={`email ${email.read ? 'read' : 'unread'}`}
-            >
-              <div className="select">
-                <input
-                  className="select-checkbox"
-                  type="checkbox"
-                  checked={email.read}
-                  onChange={() => toggleRead(email)}
-                />
-              </div>
-              <div className="star">
-                <input
-                  className="star-checkbox"
-                  type="checkbox"
-                  checked={email.starred}
-                  onChange={() => toggleStar(email)}
-                />
-              </div>
-              <div className="sender">{email.sender}</div>
-              <div className="title">{email.title}</div>
-            </li>
-          ))}
-        </ul>
+        {selectedEmail ? (
+          <EmailView
+            email={selectedEmail}
+            goBack={() => setSelectedEmail(null)}
+          />
+        ) : (
+          <Emails
+            emails={filteredEmails}
+            toggleRead={toggleRead}
+            toggleStar={toggleStar}
+            openEmail={setSelectedEmail}
+          />
+        )}
       </main>
+
     </div>
   )
 }
diff --git a/src/components/Email.jsx b/src/components/Email.jsx
new file mode 100644
index 0000000..fed37b2
--- /dev/null
+++ b/src/components/Email.jsx
@@ -0,0 +1,36 @@
+function Email({ email, toggleRead, toggleStar, openEmail }) {
+    return (
+        <li className={`email ${email.read ? "read" : "unread"}`}>
+            <div className="select">
+                <input
+                    type="checkbox"
+                    className="select-checkbox"
+                    checked={email.read}
+                    onChange={(e) => {
+                        e.stopPropagation();
+                        toggleRead(email);
+                    }}
+                />
+            </div>
+
+            <div className="star">
+                <input
+                    type="checkbox"
+                    className="star-checkbox"
+                    checked={email.starred}
+                    onChange={(e) => {
+                        e.stopPropagation();
+                        toggleStar(email);
+                    }}
+                />
+            </div>
+
+            <div className="email-info" onClick={openEmail}>
+                <div className="sender">{email.sender}</div>
+                <div className="title">{email.title}</div>
+            </div>
+        </li>
+    )
+}
+
+export default Email
diff --git a/src/components/EmailView.jsx b/src/components/EmailView.jsx
new file mode 100644
index 0000000..ff7ffad
--- /dev/null
+++ b/src/components/EmailView.jsx
@@ -0,0 +1,12 @@
+function EmailView({ email, goBack }) {
+    return (
+        <div className="email-view">
+            <button onClick={goBack}>Back</button>
+            <h2>{email.title}</h2>
+            <p><strong>From:</strong> {email.sender}</p>
+            <p>{email.body || "No content available"}</p>
+        </div>
+    )
+}
+
+export default EmailView
diff --git a/src/components/Emails.jsx b/src/components/Emails.jsx
new file mode 100644
index 0000000..54afa71
--- /dev/null
+++ b/src/components/Emails.jsx
@@ -0,0 +1,19 @@
+import Email from "./Email.jsx"
+
+function Emails({ emails, toggleRead, toggleStar, openEmail }) {
+    return (
+        <ul>
+            {emails.map((email) => (
+                <Email
+                    key={email.id}
+                    email={email}
+                    toggleRead={toggleRead}
+                    toggleStar={toggleStar}
+                    openEmail={() => openEmail(email)}
+                />
+            ))}
+        </ul>
+    )
+}
+
+export default Emails