Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 3487)
+++ wp-admin/plugins.php	(working copy)
@@ -83,7 +83,7 @@
 		<th><?php _e('Plugin'); ?></th>
 		<th><?php _e('Version'); ?></th>
 		<th><?php _e('Description'); ?></th>
-		<th><?php _e('Action'); ?></th>
+		<th colspan="2"><?php _e('Action'); ?></th>
 	</tr>
 <?php
 	$style = '';
@@ -98,20 +98,24 @@
 		$style = ('class="alternate"' == $style|| 'class="alternate active"' == $style) ? '' : 'alternate';
 
 		if (!empty($current_plugins) && in_array($plugin_file, $current_plugins)) {
-			$action = "<a href='plugins.php?action=deactivate&amp;plugin=$plugin_file' title='".__('Deactivate this plugin')."' class='delete'>".__('Deactivate')."</a>";
+			$toggle = "<a href='plugins.php?action=deactivate&amp;plugin=$plugin_file' title='".__('Deactivate this plugin')."' class='delete'>".__('Deactivate')."</a>";
 			$plugin_data['Title'] = "<strong>{$plugin_data['Title']}</strong>";
 			$style .= $style == 'alternate' ? ' active' : 'active';
 		} else {
-			$action = "<a href='plugins.php?action=activate&amp;plugin=$plugin_file' title='".__('Activate this plugin')."' class='edit'>".__('Activate')."</a>";
+			$toggle = "<a href='plugins.php?action=activate&amp;plugin=$plugin_file' title='".__('Activate this plugin')."' class='edit'>".__('Activate')."</a>";
 		}
 		$plugin_data['Description'] = wp_kses($plugin_data['Description'], array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()) ); ;
 		if ($style != '') $style = 'class="' . $style . '"';
+		if (current_user_can('edit_plugins') && is_writable(ABSPATH . 'wp-content/plugins/' . $plugin_file)) {
+			$edit = "<a href='plugin-editor.php?file=$plugin_file' title='".__('Open this file in the Plugin Editor')."' class='edit'>".__('Edit')."</a>";
+		}
 		echo "
 	<tr $style>
 		<td class='name'>{$plugin_data['Title']}</td>
 		<td class='vers'>{$plugin_data['Version']}</td>
 		<td class='desc'>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></td>
-		<td class='togl'>$action</td>
+		<td class='togl'>$toggle</td>
+		<td>$edit</td>
 	</tr>";
 	}
 ?>